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

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