Merge "DHCP6 Tests fail to remove DVR ports"