Merge "Fix ip_lib get_gateway for default gateway on an iface"

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

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

diff --cc neutron/tests/unit/agent/linux/test_ip_lib.py
Simple merge