Merge proposals dependent on lp:~allenap/maas/dev-services-shutdown

lp:~allenap/maas/dev-services-shutdown has no merge proposals.