Merge "Fix bug:range() is not same in py3.x and py2.x"

diff --cc neutron/plugins/cisco/db/n1kv_db_v2.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge

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

diff --cc neutron/tests/unit/nec/test_nec_agent.py
Simple merge

diff --cc neutron/tests/unit/nec/test_trema_driver.py
Simple merge

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