Merge "Remove use of keepalived 'vrrp_sync_group' as it is unused"

diff --cc neutron/agent/l3/ha_router.py
Simple merge

diff --cc neutron/agent/linux/keepalived.py
Simple merge

diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge