Merge proposals dependent on lp://staging/~joetalbott/ubuntu-ci-services-itself/workflow_update

1. workflow_update
2. Dependent merge proposals