improving collector parsing
minimal refactor of propertycollectors to fix space issue
Merge pull request #130 from simboss/8.x-GEOT-4392

8.x pull request for GEOT-4392