Merge "Remove RPC to plugin when dhcp sets default route"

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

diff --cc neutron/tests/unit/test_dhcp_agent.py
Simple merge

diff --cc neutron/tests/unit/test_linux_dhcp.py
Simple merge