Move zone upgrading and entry point updating to admin_version due to...

Move zone upgrading and entry point updating to admin_version due to dependency on sitemap upgrade; bug fixes with entry point upgrades