Merge "Return 404 when executing router-list-on-l3-agent with invalid agent_id"

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

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