Bug 942104 - Fix a mismerge from the backout on a CLOSED TREE; a=Tomcat