Merge "fixing vulnerabilities for tomcat catalina"