Update to latest spring-messaging changes