Fix issue with DHCP relay when IP is zero, fix merge issues