reorganize glassfish and tomcat jsp/servlet deps to ensure servlet api 3.1 doesn't transitively encroach
Merge branch 'fedora-patch-tomcat' into fedora-2.4.0-integration
Merge branch 'fedora-2.4.0-integration' into fedora-2.4.0-test
Additional reorganization of glassfish and tomcat jsp/servlet deps to ensure
servlet api 3.1 isn't pulled in before tomcat-servlet
Merge branch 'fedora-patch-tomcat' into fedora-2.4.0-integration
Merge branch 'fedora-2.4.0-integration' into fedora-2.4.0-test