Merge "Handle failures on update_dhcp_port"

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

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

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