Upgraded from Tomcat 6 to 7 (embedded)