Merge proposals dependent on lp://staging/~ci-train-bot/unity8-desktop-session/unity8-desktop-session-ubuntu-zesty-2296

1. unity8-desktop-session-ubuntu-zesty-2296
2. Dependent merge proposals