Merge proposals dependent on lp:~hopem/maas-deployer/lp1487146

lp:~hopem/maas-deployer/lp1487146 has no merge proposals.