Merge "Replaces network:* strings by constants"

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

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge

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

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