Merge "Remove workaround for kernel IPV6_MULTICAST_HOPS bug"