Merge proposals dependent on lp:~lamont/maas/bug-1603590-2.0

lp:~lamont/maas/bug-1603590-2.0 has no merge proposals.