Further alignment with 8.0.x and later. Fixes Linux test failures.

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