Merge "Update version of Apache Tomcat dependency as per security scan"