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

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