Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56611
Refactor code to remove inefficient calls to Method.isAnnotationPresent(). 
Additional fixed that were missed in r1603591.

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