fix DHCPv6, ICMPv6 issues with latest merge