Merge revision 4506 from pjproject trunk:

Fixed #1661: Option to use SO_REUSEADDR for TCP and TLS listeners and use it by default on non-Windows platforms
Merge branch 'patch/backport-r4506' of git://github.com/asterisk/pjproject

Fix up merge tracking for latest patch.