Merge proposals dependent on lp:~gz/juju-chaos-monkey/refactor_net_chaos

lp:~gz/juju-chaos-monkey/refactor_net_chaos has no merge proposals.