Bug 8025: Correct non-NAPT to NAPT tunnel ID