Revert "Merge branch 'master' of github.com:spring-projects/spring-integration into INT-3460"

This reverts commit f38d30299ef80f3962511dfa71ed89df11e37404, reversing
changes made to f2777344254ab38bc34df8c9801006a7c7752bad.