Merge "Move metadata agent entry to its own file"

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

diff --cc setup.cfg
index e54f58cda0ec82e401b1d75bca0e4a7967c50774,ba6537a018dc46558afb124fdf0d1cf2cd0f0934..ab04d570cbac795e133f8a63bdae9e92c1e72799
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -103,9 -103,9 +103,9 @@@ console_scripts 
      neutron-dhcp-agent = neutron.agent.dhcp_agent:main
      neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
      neutron-ibm-agent = neutron.plugins.ibm.agent.sdnve_neutron_agent:main
 -    neutron-l3-agent = neutron.agent.l3.agent:main
 +    neutron-l3-agent = neutron.agent.l3_agent:main
      neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
-     neutron-metadata-agent = neutron.agent.metadata.agent:main
+     neutron-metadata-agent = neutron.agent.metadata_agent:main
      neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
      neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
      neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main