Upgrade to tomcat7