Upgrade: support upgrade from v0.7 to v1.0

Pivotal ID: 51603177