Update packages to use Apache Tomcat 7.0.40