Merge proposals dependent on lp://staging/~brendan-donegan/maas/fix_juju_bootstrap

lp://staging/~brendan-donegan/maas/fix_juju_bootstrap has no merge proposals.