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

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