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

1. indicator-bluetooth-ubuntu-yakkety-landing-022
2. Dependent merge proposals