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

...x/cisd/authentication/ldap/LDAPAuthenticationService.java

.../cisd/authentication/ldap/LDAPDirectoryConfiguration.java

...systemsx/cisd/authentication/ldap/LDAPPrincipalQuery.java

...d/authentication/ldap/LDAPDirectoryConfigurationTest.java

common/source/java/genericCommonContext.xml

...st/java/ch/systemsx/cisd/common/test/ToStringMatcher.java

datastore_server/etc/service.properties

datastore_server/source/core-plugins/core-plugins.properties

.../1/as/custom-imports/test-custom-import/plugin.properties

...gins/import-test/1/as/services/import-test/import-test.py

...s/import-test/1/as/services/import-test/plugin.properties

...est/1/dss/drop-boxes/test-custom-import/plugin.properties

...eneric-test/1/dss/drop-boxes/test-custom-import/script.py

...enbis/generic/dss/systemtest/api/v3/AbstractFileTest.java

...ic/dss/systemtest/api/v3/CreateExperimentsImportTest.java

...eric/dss/systemtest/api/v3/CreateMaterialsImportTest.java

...eneric/dss/systemtest/api/v3/CreateSamplesImportTest.java

...enbis/generic/dss/systemtest/api/v3/CustomImportTest.java

...nbis/generic/dss/systemtest/api/v3/GeneralImportTest.java

...v3/GeneralImportTestResources/materials_excel_97_2003.xls