Merge proposals dependent on lp:~newell-jensen/maas/fix-1557589

lp:~newell-jensen/maas/fix-1557589 has no merge proposals.