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

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