Merge proposals dependent on lp:~jbauer/cloud-init/salt

lp:~jbauer/cloud-init/salt has no merge proposals.