Merge updates from Tomcat 12.0.x
10 files changed