Merge "Change linux/ip_lib code to better handle address families"

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

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

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

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