Merged revisions r1562597,r1564742-r1564746 from tomcat/trunk:
Make the xmlBlockExternal option in Catalina and Jasper to be true by default.

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