Merge remote-tracking branch 'origin/dependabot/gradle/modules/jdbc-test/org.apache.tomcat-tomcat-jdbc-11.0.21' into combined-pr-branch