Merge proposals dependent on lp:~ricgard/maas/testing-and-fixes

lp:~ricgard/maas/testing-and-fixes has no merge proposals.