Merge proposals dependent on lp://qastaging/~ci-train-bot/unity-scopes-shell/unity-scopes-shell-ubuntu-yakkety-1967

1. unity-scopes-shell-ubuntu-yakkety-1967
2. Dependent merge proposals