Merge proposals dependent on lp://staging/~cjohnston/ubuntu-ci-services-itself/add-tarmac-config-uci-ops

1. add-tarmac-config-uci-ops
2. Dependent merge proposals