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

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