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

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