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

1. indicator-network-ubuntu-zesty-2185
2. Dependent merge proposals