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

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