Merge "Remove deprecated use_namespaces option"

diff --cc etc/dhcp_agent.ini
Simple merge

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

diff --cc neutron/agent/l3/agent.py
Simple merge

diff --cc neutron/agent/l3/dvr_local_router.py
Simple merge

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

diff --cc neutron/tests/unit/agent/dhcp/test_agent.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_dvr_local_router.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_ha_router.py
Simple merge

diff --cc neutron/tests/unit/agent/linux/test_dhcp.py
Simple merge