Backport fixes for ip6t_hbh.