Merge proposals dependent on lp://qastaging/~ricgard/maas/bug-1660863

lp://qastaging/~ricgard/maas/bug-1660863 has no merge proposals.