Merge "Remove individual cfg.CONF.resets from tests"

diff --cc neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
Simple merge

diff --cc neutron/tests/unit/cisco/test_network_plugin.py
Simple merge

diff --cc neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/ml2/drivers/test_l2population.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_port_binding.py
Simple merge

diff --cc neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/test_api_v2.py
Simple merge

diff --cc neutron/tests/unit/test_db_plugin.py
Simple merge