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

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