Upgrade to Spring Integration 4.0