Merge "Remove check on dhcp enabled subnets while scheduling dvr"

diff --cc neutron/tests/unit/db/test_agentschedulers_db.py
Simple merge

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