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

1. indicator-power-ubuntu-xenial-landing-002
2. Dependent merge proposals