Better fix for BZ56199
Fix failing unit tests caused by original fix.

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