Merge proposals dependent on lp:~ricgard/maas/bug-1682152

lp:~ricgard/maas/bug-1682152 has no merge proposals.