Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Fix entrypoint.sh in example-setup with broker
  entrypoint.sh: Fix setting JAVA_OPTS variable
  Make the code build on Java 8
  Run apply-object before the ref-updated stream event
  Add extra logging when replication tasks are merged

Change-Id: I181e9ad8fab92a8086450c88101ca6112ea71aed