Merge proposals dependent on lp://staging/~brendan-donegan/maas/maas-ci-config_remove_old_add_yakkety

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