Merge "Fixing some tests for DHCP IPv6"