Merge proposals dependent on lp://staging/~blake-rouse/maas/fix-1353597-1.6

lp://staging/~blake-rouse/maas/fix-1353597-1.6 has no merge proposals.