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

1. unity-scopes-shell-ubuntu-zesty-2302
2. Dependent merge proposals