Merge "make neutron-ns-metadata-proxy configurable"

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

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

diff --cc neutron/agent/metadata/namespace_proxy.py
Simple merge

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

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