[Bug 226499] New: Merge Review: tomcat5