Merge remote-tracking branch 'upstream/develop' into PLFM-3048
refactoring to make lib-table-cluster a dependency of jdo-models instead of the other way around
Merge remote-tracking branch 'upstream/develop' into PLFM-3048
Merge pull request #1564 from marcel-blonk/PLFM-3048

Plfm 3048