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

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