Merge "Replace IPv4 and IPv6 default addresses with constants"

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

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

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