Merge "Revert "Patch dhcp agent to avoid unwanted resync""