Merge "Added TAP_DEVICE_PREFIX info to common/constants"

diff --cc neutron/agent/linux/interface.py
Simple merge

diff --cc neutron/agent/linux/iptables_firewall.py
Simple merge

diff --cc neutron/common/constants.py
Simple merge

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

diff --cc neutron/plugins/brocade/NeutronPlugin.py
Simple merge

diff --cc neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/unit/ofagent/test_ofa_ports.py
Simple merge