[Bug 226499] Merge Review: tomcat5