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

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