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

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