Merge pull request #4762 from mpg/fix-overly-aggressive-udp-proxy-2.x

[Backport 2.x] Fix bug with UDP proxy not forwarding enough