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

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