Merge "fix get_ha_sync_data_for_host for non-dvr agent"

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

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

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