EDIT

ref #6190 removing svn property place holder in first line of code

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

missed to add the adapted test

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

add test for ermIdInVocabularyComparator

Merge remote-tracking branch 'origin/develop' into cdm-4.1

Conflicts:
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...

fix clone test for Media

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount, fix Testdata