Prepare for security-related catalina/tomcat version updates