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

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