Merge proposals dependent on lp:~rvb/maas/enlist-failure-fix

lp:~rvb/maas/enlist-failure-fix has no merge proposals.