JIRA: https://jira.spring.io/browse/INT-3843 **Cherry-pick to the 3.0.x** Conflicts: spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java Resolved.
JIRA: https://jira.spring.io/browse/INT-3843 **Cherry-pick to the 3.0.x** Conflicts: spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java Resolved.