Merge proposals dependent on lp://staging/~ci-train-bot/unity-scope-click/unity-scope-click-ubuntu-zesty-2172

1. unity-scope-click-ubuntu-zesty-2172
2. Dependent merge proposals