merge master -Dorg -Ssuccess-only

Repository: ome/omero-server
Excluded PRs:
  - PR 168 scuniff 'ome#167  equals() comparing objects of different types' (user: scuniff)
  - 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 151 jburel 'bump org.openmicroscopy.project 5.6.0'
  - PR 152 jburel 'Set class in doc'

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

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

Author: snoopycrimecop