Merge proposals dependent on lp:~blake-rouse/maas/fix-1598175

lp:~blake-rouse/maas/fix-1598175 has no merge proposals.