Merge remote-tracking branch 'origin/master'

api-openbis-python3-pybis/src/python/pybis/pybis.py

api-openbis-python3-pybis/src/python/tests/test_openbis.py

...le-system-plugins/eln-tree/resolver-plugins/microscopy.py

...ins/eln-lims/1/dss/file-system-plugins/eln-tree/script.py

...nbis/systemtest/plugin/excelimport/ImportSamplesTest.java

.../excelimport/test_files/samples/sample_type_elsewhere.xls

...mport/test_files/samples/sample_type_elsewhere_cyclic.xls

...ource/eclipse/Command Framework Demo CommandServer.launch

...rce/eclipse/Command Framework Demo DataSetServer 1.launch

...rce/eclipse/Command Framework Demo DataSetServer 2.launch

...lication-server/resource/eclipse/openBIS All Tests.launch

...ication-server/resource/eclipse/openBIS dev server.launch

...hz/sis/openbis/generic/server/xls/importer/XLSImport.java

...r/xls/importer/helper/PropertyAssignmentImportHelper.java

...inal-data-store/resource/eclipse/Data Store Server.launch

...al-data-store/resource/eclipse/DataSetUploadClient.launch