Merge proposals dependent on lp://staging/~ci-train-bot/indicator-application/indicator-application-ubuntu-cosmic-3675

1. indicator-application-ubuntu-cosmic-3675
2. Dependent merge proposals