EDIT

Correct tests to account for change in cache loader mechanism

Fix duplicate entity issue with newly created cdm entities

Use new find method with update

Correct issues from last merge

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...

#5010 : Initial commit to fix duplicate entry issue when creating new key node

Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts