improving dependencies
Merge branch '2.2.x' of https://github.com/geosolutions-it/geoserver-enterprise into 2.2.x