Merge proposals dependent on lp:~jtv/maas/bug-1363900

lp:~jtv/maas/bug-1363900 has no merge proposals.