Merge branch 'master' of https://sissource.ethz.ch/sispub/openbis

...bis/generic/server/hotfix/ELNCollectionTypeMigration.java

...ns/eln-lims-life-sciences/1/as/master-data/data-model.xls

...dist/core-plugins/eln-lims/1/as/initialize-master-data.py

...ist/core-plugins/eln-lims/1/as/master-data/data-model.xls

...ss/reporting-plugins/zenodo-exports-api/plugin.properties

...ins/xls-import/1/as/services/xls-import-api/entrypoint.py

...rt-api/parsers/definition_to_creation/creation_parsers.py

...s/xls-import-api/processors/openbis_duplicates_handler.py

.../xls-import-api/search_engines/search_criteria_factory.py

...s/services/xls-import-api/search_engines/search_engine.py

...ugin/excelimport/test_files/experiments/all_elsewhere.xls

.../plugin/excelimport/test_files/experiments/all_inside.xls

...in/excelimport/test_files/experiments/experiment_type.xls

...port/test_files/experiments/experiment_type_elsewhere.xls

...est/plugin/excelimport/test_files/experiments/no_code.xls

...port/test_files/experiments/no_non_mandatory_property.xls

.../plugin/excelimport/test_files/experiments/no_project.xls

...est/plugin/excelimport/test_files/experiments/project.xls

...mtest/plugin/excelimport/test_files/experiments/space.xls

...rt/test_files/experiments/space_and_project_elsewhere.xls