merge master -Dorg -Ssuccess-only

Repository: ome/omero-server
Excluded PRs:
  - PR 166 kkoz 'Experimenter group cache' (stage: draft)
  - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.

Merged PRs:
  - PR 152 jburel 'Set class in doc'
  - PR 185 sbesson 'Replace usage of Apache Commons Library by SL4J'

Conflicting PRs (not included):
  - PR 61 joshmoore 'Pass user executor to rendering tasks'

Generated by OMERO-build-push#331 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/331/)