Merge proposals dependent on lp://staging/~rvb/maas/maas-ci-enable-trunk

lp://staging/~rvb/maas/maas-ci-enable-trunk has no merge proposals.