- Properly rename files - Use new package-installs - Properly check for discoverd_callback_url option (and return backward compatibility) Change-Id: I2247047b9360945408e720329d5b134cfa384ae5