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

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
	cdmlib-model/pom.xml
	cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java
	cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java
	cdmlib-persistence/pom.xml
	cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
	cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
	cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java
	cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TaxonNodeDto.java
	cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
	cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java
	cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.testFindByIdentifierOrMarker.xml
	cdmlib-test/pom.xml