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

common/build.gradle

...stemsx/cisd/common/servlet/CISDContextLoaderListener.java

...common/spring/ExposablePropertyPlaceholderConfigurer.java

commonbase/build.gradle

...storeserver/systemtests/JsonDssServiceRpcGenericTest.java

...h/systemsx/cisd/dbmigration/AbstractDatabaseAdminDAO.java

...a/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java

.../java/ch/systemsx/cisd/dbmigration/h2/H2MassUploader.java

...ava/ch/systemsx/cisd/dbmigration/java/IMigrationStep.java

.../systemsx/cisd/dbmigration/java/MigrationStepAdapter.java

...systemsx/cisd/dbmigration/java/MigrationStepExecutor.java

...x/cisd/dbmigration/postgresql/PostgreSQLMassUploader.java

...cisd/dbmigration/java/MigrationStepAdminFrom001To002.java

...emsx/cisd/dbmigration/java/MigrationStepFrom001To002.java

...emsx/cisd/dbmigration/java/MigrationStepFrom002To003.java

gradle/settings.gradle

installation/settings.gradle

...installer/izpack/SetEnableTechnologiesVariableAction.java

...aller/izpack/SetEnableTechnologiesVariableActionTest.java

microscopy-migration-tool/.gitignore