merge develop -Dorg -Ssuccess-only

Repository: ome/openmicroscopy
Excluded PRs:
  - PR 6347 sbesson 'Upgrade Ivy to 2.5.1' (label: exclude)
  - PR 6319 dominikl 'Add integration test for joining session' (exclude comment)
  - PR 6275 joshmoore 'Add OMERO5.4__1 for omero-model#71' (exclude comment)
  - PR 6212 jburel 'add test to import images' (exclude comment)
  - PR 6086 manics 'Alternative JSON configuration system for OMERO.web' (label: exclude)
Already up-to-date.

Merged PRs:
  - PR 6301 jburel 'Use the copy'
  - PR 6309 jburel 'add try block'
  - PR 6348 sbesson 'logback.xml/logback-indexing.xml: add default scanPeriod of 1 minute'
  - PR 6349 sbesson 'Map contributors to use canonical real names and email addresses ome#482'
  - PR 6350 sbesson 'Fix off-by-one bin assignment in histogram tests'

Conflicting PRs (not included):
  - PR 6346 sbesson 'Remove no-op services.jar from being generated by the build system'

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