Merge duplicate changelog entries in 6.0.40.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1593824 13f79535-47bb-0310-9956-ffa450edef68
Followup to r1589635
To simplify code and align it with TC7 & 8.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1593826 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Additional change missed in back-port to fix BZ 56334

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1593832 13f79535-47bb-0310-9956-ffa450edef68