https://build.spring.io/browse/INT-MASTER-583/ **Cherry-pick to 4.3.x** Conflicts: spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSourceTests.java spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSourceTests.java