Merge proposals dependent on lp://staging/~canonical-platform-qa/checkbox/lbuilding-on-oauth-community-testing-take2

1. lbuilding-on-oauth-community-testing-take2
2. Dependent merge proposals