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

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