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

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