Merge proposals dependent on lp://qastaging/~ci-train-bot/indicator-session/indicator-session-ubuntu-zesty-2198

1. indicator-session-ubuntu-zesty-2198
2. Dependent merge proposals