Merge "Fix l3 agent scheduling logic to avoid unwanted failures"

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

diff --cc neutron/tests/unit/openvswitch/test_agent_scheduler.py
Simple merge

diff --cc neutron/tests/unit/test_l3_schedulers.py
Simple merge