Port unit test changes from trunk that should allow ASF CI system to complete without error

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