EDIT

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 4.2.0-SNAPSHOT development

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

Updating develop poms back to pre merge state

updating develop poms to master versions to avoid merge conflicts

updating poms for 4.1.0-SNAPSHOT development

Remove bidirectionality for supplemental data #5743

Update test data for xxxObj_type #3701

Adapt table and column names to hibernate 5 naming strategy #5369

... and some other changes to table/attribute names