minimal refactor of propertycollectors to fix space issue
GEOT-4392
Merge pull request #132 from simboss/9.x

GEOT-4392, minimal refactor of propertycollectors to fix space issue