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

...common/spring/ExposablePropertyPlaceholderConfigurer.java

...cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java

...erver/json/deserializer/JsonTypeAndClassDeserializer.java

.../server/json/deserializer/JsonTypeAndClassSerializer.java

.../introspector/JsonTypeAndClassAnnotationIntrospector.java

...server/json/resolver/JsonTypeAndClassResolverBuilder.java

...openbis/common/api/server/json/JsonSerializationTest.java

...sx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java

...hz/sis/openbis/systemtest/asapi/v3/ProjectSampleTest.java

...temtest/AbstractAssignmentSampleToExperimentTestCase.java

...openbis/systemtest/AbstractDataSetAssignmentTestCase.java

...sd/openbis/systemtest/AbstractEntityDeletionTestCase.java

...s_standard_technologies/.dynamic_property_evaluator_queue

openbis_standard_technologies/build.gradle

...rd_technologies/dist/core-plugins/core-plugins.properties

.../html/js/views/AdvancedSearch/AdvancedSearchController.js

...-lims/html/js/views/AdvancedSearch/AdvancedSearchModel.js

...n-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js

openbis_standard_technologies/source/java/service.properties

...bis/systemtest/plugin/excelimport/AbstractImportTest.java