[Bug 485933] Cumulative fix of tomcat6