Merge proposals dependent on lp://qastaging/~raharper/ubuntu-core-config/trunk.update-cloud-init-config-v2

1. trunk.update-cloud-init-config-v2
2. Dependent merge proposals