Merge proposals dependent on lp://qastaging/~ci-train-bot/indicator-network/indicator-network-ubuntu-xenial-landing-080

1. indicator-network-ubuntu-xenial-landing-080
2. Dependent merge proposals