Merge proposals dependent on lp://staging/~thumper/launchpad/more-careful-network-service-usage

1. more-careful-network-service-usage
2. Dependent merge proposals