Merge proposals dependent on lp:~ci-train-bot/unity-scopes-shell/unity-scopes-shell-ubuntu-xenial-landing-047

1. unity-scopes-shell-ubuntu-xenial-landing-047
2. Dependent merge proposals