XD-1464 - Upgrade to Spring Integration 4.0.0.M4