Code review comment for ~chad.smith/cloud-init:fix-instance-identity-upgrade-path

1. Git
2. lp:~chad.smith/cloud-init
3. fix-instance-identity-upgrade-path
4. Merge into master