Merge proposals dependent on lp://staging/~ci-train-bot/unity-scope-click/unity-scope-click-ubuntu-yakkety-landing-072

1. unity-scope-click-ubuntu-yakkety-landing-072
2. Dependent merge proposals