SSDM-4331: solving merging conflict in openbis.js

...ver/dssapi/v3/executor/CreateUploadedDataSetExecutor.java

.../server/dssapi/v3/upload/StoreShareFileUploadServlet.java

...cisd/etlserver/api/v1/DataSetTypeToRegistratorMapper.java

.../ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java

...msx/cisd/openbis/dss/generic/server/DataStoreService.java

...openbis/dss/generic/shared/IDataStoreServiceInternal.java

...x/cisd/openbis/dss/generic/shared/IPutDataSetService.java

...ric/dss/systemtest/api/v3/CreateUploadedDataSetsTest.java

...1/as/webapps/openbis-v3-api-test/html/test/test-create.js

...cutor/common/get/AbstractGetObjectsOperationExecutor.java

...common/search/AbstractSearchObjectsOperationExecutor.java

...thorizationgroup/AuthorizationGroupComparatorFactory.java

...api/v3/helper/experiment/ExperimentComparatorFactory.java

...per/globalsearch/GlobalSearchObjectComparatorFactory.java

...erver/asapi/v3/helper/plugin/PluginComparatorFactory.java

...ver/asapi/v3/helper/project/ProjectComparatorFactory.java

.../helper/property/PropertyAssignmentComparatorFactory.java

...api/v3/helper/property/PropertyTypeComparatorFactory.java

...erver/asapi/v3/helper/sample/SampleComparatorFactory.java

...eneric/server/asapi/v3/helper/sort/ComparatorFactory.java