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

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