Bump to Tomcat 7.0.40