Merge proposals dependent on lp:~mpontillo/maas/fix-1552719

lp:~mpontillo/maas/fix-1552719 has no merge proposals.