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

ref #6138 handle ClearDB_with_Terms_DataSet.xml correctly

fix #6138: add empty dataset to resources

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

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase

Revert "ref #6401 fix failing SecurityTest (due to wrong handling of furtherVotingResult in CdmPermissionVoter"

This reverts commit 5cb08c3f89abfd1bcb5af75f0b2882798418f27a.

ref #6401 fix failing SecurityTest (due to wrong handling of furtherVotingResult in CdmPermissionVoter

cleanup

fixing createTestData - applying manual additions from xml dataset