Merge "Remove the useless vim modelines"

diff --cc neutron/plugins/bigswitch/config.py
Simple merge

diff --cc neutron/plugins/bigswitch/servermanager.py
Simple merge

diff --cc neutron/plugins/cisco/common/config.py
Simple merge

diff --cc neutron/plugins/cisco/n1kv/n1kv_client.py
Simple merge

diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge

diff --cc neutron/scheduler/dhcp_agent_scheduler.py
Simple merge

diff --cc neutron/services/loadbalancer/drivers/radware/driver.py
Simple merge

diff --cc neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py
Simple merge

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