Merge pull request #538 from geosolutions-it/up-m

GEOT-4891, minor clean up on the clip process
minor clean up on the clip process
Merge branch 'master' of https://github.com/geotools/geotools into up-m