Followup for bug 64931 - Declare additional elements used in other versions of Tomcat.
Followup for bug 64931 - Declare additional elements used in other versions of Tomcat.

apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat