Merge proposals dependent on lp:~cloud-init-dev/cloud-init/cloud-init.org

lp:~cloud-init-dev/cloud-init/cloud-init.org has no merge proposals.