EDIT

Adapt listeners and tests to new pre-insert strategy #5066

Merge branch 'develop' into ticket-5066

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java

Set transient id for root merge object

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts

resolving conficts in project versions after hotfixrelease

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods

updating poms for 3.11.1 branch with snapshot versions

Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods" since this commit needs to be in a hotfix release.

This reverts commit 2693f7105470815383cdf485355e7fc5ad81ed68.

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods