Merge proposals dependent on lp:~jtv/maas/db-setup

lp:~jtv/maas/db-setup has no merge proposals.