Merge proposals dependent on lp://staging/~brendan-donegan/maas/maas-ci-config_xenial_2.1

lp://staging/~brendan-donegan/maas/maas-ci-config_xenial_2.1 has no merge proposals.