#81, backport GEOS-5985
Merge pull request #84 from geosolutions-it/tomcat

#81, backport GEOS-5985