Merge branch '2.5.x'

Closes gh-27088

Author: philwebb

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
-kotlinVersion=1.5.10
-tomcatVersion=9.0.46
+kotlinVersion=1.5.20
+tomcatVersion=9.0.48
 
 kotlin.stdlib.default.dependency=false