minimal refactor of propertycollectors to fix space issue
GEOS-5647
Merge pull request #131 from simboss/master-GEOT-4392

Fix for GEOT-4392
Merge branch 'master' of git://github.com/geotools/geotools