Merge pull request #8240 from reubendowle/fixes/nhrp-nat

nhrp: NAT fixes

diff --cc nhrpd/nhrp_cache.c
Simple merge

diff --cc nhrpd/nhrp_interface.c
Simple merge

diff --cc nhrpd/nhrp_nhs.c
Simple merge

diff --cc nhrpd/nhrp_peer.c
Simple merge

diff --cc nhrpd/nhrp_shortcut.c
Simple merge

diff --cc nhrpd/nhrpd.h
Simple merge

diff --cc nhrpd/zbuf.c
Simple merge