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

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