Merge proposals dependent on lp://qastaging/~ci-train-bot/indicator-application/indicator-application-ubuntu-xenial-2391

1. indicator-application-ubuntu-xenial-2391
2. Dependent merge proposals