Merge pull request #4763 from mpg/fix-overly-aggressive-udp-proxy-2.16

[Backport 2.16] Fix bug with UDP proxy not forwarding enough