Merge proposals dependent on lp://staging/~brendan-donegan/maas/cloud-init-fix

lp://staging/~brendan-donegan/maas/cloud-init-fix has no merge proposals.