Work-around CI build failures

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1513897 13f79535-47bb-0310-9956-ffa450edef68
Fix non-blocking test failures on OSX.

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