Updated to latest Tomcat versions