Bring in fixes from tomcat 6.0.x up to r739532 (or tomcat trunk r734734):