reorganize glassfish and tomcat jsp/servlet deps to ensure servlet api 3.1 doesn't transitively encroach