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

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