Upgrade to Tomcat7.0.42