Merge "Update tomcat version"