Upgrade cleanups.

Clean up the upgrade installer to handle upgrades for sites running
Sandbox 1.8.