Merge proposals dependent on lp://qastaging/~blake-rouse/maas/fix-1453730

lp://qastaging/~blake-rouse/maas/fix-1453730 has no merge proposals.