Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54781
Fix NPE if no matching Endpoint is found.
Handle forwarded requests as well.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1471123 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54708
Handle ROOT##version as well
Suggestion by kkolinko

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