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

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