initial changes for forwarding port modifications
Merge remote-tracking branch 'upstream/master'
Merge pull request #4616 from crypt1d/master

Consider the host_ip value when handling port collisions