Merge proposals dependent on lp://staging/~maas-committers/maas/trunk

lp://staging/~maas-committers/maas/trunk has no merge proposals.