Merge proposals dependent on lp://staging/~julian-edwards/maas/1.6-savepoints-migration

lp://staging/~julian-edwards/maas/1.6-savepoints-migration has no merge proposals.