Merge "Add eventlet monkey_patch helper"

diff --cc setup.cfg
index 2cb5a6818766d7bd3e74d90a8f1bc45f8d29d9ec,a9e1714931b910c6b5812c66e038e424deed092f..b3d8824c824b29deaf132260693656c9d5559cef
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -104,9 -103,8 +104,9 @@@ console_scripts 
      neutron-nec-agent = neutron.cmd.eventlet.plugins.nec_neutron_agent:main
      neutron-netns-cleanup = neutron.cmd.netns_cleanup:main
      neutron-ns-metadata-proxy = neutron.cmd.eventlet.agents.metadata_proxy:main
 +    neutron-ovsvapp-agent = neutron.cmd.eventlet.plugins.ovsvapp_neutron_agent:main
      neutron-nvsd-agent = neutron.plugins.oneconvergence.agent.nvsd_neutron_agent:main
-     neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
+     neutron-openvswitch-agent = neutron.cmd.eventlet.plugins.ovs_neutron_agent:main
      neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main
      neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main
      neutron-server = neutron.cmd.eventlet.server:main