Merge proposals dependent on lp://staging/~fginther/ubuntu-ci-services-itself/tarmac-config-add-cu2d-airline

1. tarmac-config-add-cu2d-airline
2. Dependent merge proposals