Merge branch 'upstream-dynamic-routing' into bp/bgp-dynamic-routing

Conflicts:
	etc/dr_agent.ini
	etc/neutron.conf
	neutron/agent/dr_agent.py
	neutron/db/dr_agentschedulers_db.py
	neutron/db/dr_db.py
	neutron/db/migration/alembic_migrations/versions/15be73214821_add_dynamic_routing_model_data.py
	neutron/extensions/dr_agentscheduler.py
	neutron/extensions/dynamic_routing.py
	neutron/plugins/common/constants.py
	neutron/scheduler/dr_agent_scheduler.py
	neutron/services/dynamic_routing/dr_rpc_base.py
	neutron/tests/unit/test_dynamicrouting_plugin.py
	neutron/tests/unit/test_extension_dynamic_routing.py
Merge branch 'bp/bgp-dynamic-routing' of https://github.com/midokura/neutron into bp/bgp-dynamic-routing

Conflicts:
	etc/dr_agent.ini
	neutron/agent/dr_agent.py
	neutron/services/dynamic_routing/dr_rpc_base.py
Last commit