Merge remote-tracking branch 'origin/master' into merge-branch

Change-Id: I9c29ad9564671ae5a2db35835bc4a30e75482cb2

diff --cc neutron/api/extensions.py
Simple merge

diff --cc neutron/server/__init__.py
Simple merge

diff --cc requirements.txt
Simple merge

diff --cc setup.cfg
index f1bcddaf9f887cc0705af037ff922510793e1e1c,5f3de4db123ca61bdd6a282800aadde2c4a9cfd1..1c39d1c3cfc4db0dd59acea1a1de5c431ae8688a
--- 1/setup.cfg
--- 2/setup.cfg
+++ b/setup.cfg
@@@ -102,9 -93,9 +93,10 @@@ console_scripts 
      neutron-nvsd-agent = neutron.plugins.oneconvergence.agent.nvsd_neutron_agent:main
      neutron-openvswitch-agent = neutron.cmd.eventlet.plugins.ovs_neutron_agent:main
      neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main
+     neutron-pd-notify = neutron.cmd.pd_notify:main
      neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main
 -    neutron-server = neutron.cmd.eventlet.server:main
 +    neutron-server = neutron.cmd.eventlet.server:main_wsgi_eventlet
 +    neutron-dev-server = neutron.cmd.eventlet.server:main_wsgi_pecan
      neutron-rootwrap = oslo_rootwrap.cmd:main
      neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon
      neutron-usage-audit = neutron.cmd.usage_audit:main