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

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