Merge proposals dependent on lp://staging/~brendan-donegan/maas/maas-ci-config_2.0_jobs

lp://staging/~brendan-donegan/maas/maas-ci-config_2.0_jobs has no merge proposals.