Merge proposals dependent on lp:~smoser/cloud-init/lp-1015223

lp:~smoser/cloud-init/lp-1015223 has no merge proposals.