**Cherry-pick to master** Conflicts: build.gradle spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml
**Cherry-pick to master** Conflicts: build.gradle spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/DataSource-derby-context.xml