Resolve #1 by incorporating next protocol in acceptor remote address and connector local address.
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #2 from jfallows/develop

Resolve #1 by incorporating next protocol in acceptor remote address...