commit accepted patch for BZ 54456


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1476544 13f79535-47bb-0310-9956-ffa450edef68
commit accepted patch for BZ 54044


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