Merge proposals dependent on lp://staging/~ci-train-bot/indicator-network/indicator-network-ubuntu-yakkety-1966

1. indicator-network-ubuntu-yakkety-1966
2. Dependent merge proposals