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

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