Additional reorganization of glassfish and tomcat jsp/servlet deps to ensure
servlet api 3.1 isn't pulled in before tomcat-servlet