Also add another control-bus test. Conflicts: spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java Resolved.
Also add another control-bus test. Conflicts: spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java Resolved.