EDIT

#5031 Update remoting code to be compatible with new common service collection calls

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

#5025 : Implement load of UpdateResult using new cdm entity identifier

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

Empty text fields return empty string and not null

Revert "index on develop: 6992bef Rename NonViralName authorteams to authorship #4968"

This reverts commit 32cded397931ad359f7818fdfb91a113a074342e.

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

Enable tests again

#4074 : Fix initialisation, use and disposal of mocke session owner

Rename NonViralName authorteams to authorship #4968