Merge "Descheduling DVR routers when ports are unbound from VM"

diff --cc neutron/db/l3_dvrscheduler_db.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
Simple merge