EDIT

ref #6368 remove TaxonNameBase subclasses

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

adapt tests to return type updateResult and missing exception for update-services methods

change return type of changeSynonymToAcceptedTaxon to updateResult

ref #6138 handle ClearDB_with_Terms_DataSet.xml correctly

Add propertyPath to service method

fix #6138: add empty dataset to resources

fix #6138: add dataset to test to fix the test

fix #6535 change CdmMetaData.propertyName from int to string, adapt test schema and test

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase