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

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