Merged r1464781 r1466106 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54802
Provide location information for exceptions thrown by JspDocumentParser

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