Merge proposals dependent on lp://staging/~ursinha/ubuntu-ci-services-itself/private-only-is-env-variable

1. private-only-is-env-variable
2. Dependent merge proposals