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

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