Merge proposals dependent on lp://staging/~ci-train-bot/indicator-session/indicator-session-ubuntu-artful-2869

1. indicator-session-ubuntu-artful-2869
2. Dependent merge proposals