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

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