Merge proposals dependent on lp:~julian-edwards/maas/backport-r1294-1299

lp:~julian-edwards/maas/backport-r1294-1299 has no merge proposals.