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

This reverts commit fa4402c8df1c6ebba4c7532e39b31b77c59a14a0.