Sync up the Catalina and Jasper TLD scanning code prior to adding some optional extensions for the embedded use case. A couple of options from the Jasper side have been removed as they were only ever used with one value. The JSP 2.1 TCK passes with these changes.
Changed paths:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties