Tomcat 7 and 8 upgraded to latest versions