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

openbis_benchmark/benchmark-sample.png

openbis_benchmark/build.gradle

openbis_benchmark/conf/config.json

...chmark/src/main/java/ch/ethz/sis/benchmark/Benchmark.java

...c/main/java/ch/ethz/sis/benchmark/impl/LoadBenchmark.java

...k/src/main/java/ch/ethz/sis/ssl/SslCertificateHelper.java

...bis_benchmark/src/main/java/ch/ethz/sis/startup/Main.java

...urces/ch/ethz/sis/benchmark/util/google-10000-english.txt

openbis_benchmark/src/main/resources/log4j2.xml

...s/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py