Update skip_nat_port to latest master.

(so we can get our PR merged)