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

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