Saw a failure on Windows.
Switch to our standard pattern for waiting that allows the possibility of a long wait but will finish sooner if it can rather than using a fixed wait.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1562596 13f79535-47bb-0310-9956-ffa450edef68
Make the xmlBlockExternal option in Catalina and Jasper to be true by default.

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