Merge proposals dependent on lp://staging/~ci-train-bot/indicator-application/indicator-application-ubuntu-zesty-landing-022

1. indicator-application-ubuntu-zesty-landing-022
2. Dependent merge proposals