merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  - PR 6205 chris-allan 'Test cases for expanded user session creation abilities' (status: failure)
  - PR 6101 dominikl 'Set namespace of fileannoation of omero.table - test' (status: failure)
  - PR 6099 will-moore 'Use chosen plugin for script UI if large number of options' (label: exclude)
  - PR 6096 will-moore 'Script gui file upload' (label: exclude)
  - PR 6094 manics 'omero.web.override_root_app to set custom web root app' (label: exclude)
  - PR 6093 manics 'admin diagnostics: show BF (and optionally other) jar versions' (label: exclude)
  - PR 6086 manics 'Alternative JSON configuration system for OMERO.web' (label: exclude)
  - PR 6083 manics 'web: omero.web.http_response_headers to set custom headers' (label: exclude)
  - PR 6081 will-moore 'Webclient performance fixes' (label: exclude)
  - PR 5966 joshmoore 'Allow testing multiple builds in travis' (status: failure)
  - PR 5946 manics 'Python gateway secure' (label: exclude)
  - PR 5914 kennethgillen 'Adding --as-default to CLI omero user joingroup' (label: exclude)
  - PR 5912 manics 'OMERO.web default log can be changed to stdout' (label: exclude)
  - PR 5910 manics 'Allow cli_login to be used without closing session' (label: exclude)
  - PR 5884 manics 'Ignore owner when checking omero.data.dir is accessible' (label: exclude)
Already up-to-date.

Merged PRs:
  - PR 6060 rgozim 'Added gradle support to omerojava component'
  - PR 6071 joshmoore 'Tests for 5.5.2 PRs'
  - PR 6176 sbesson 'Restore CLI DB integration tests'
  - PR 6207 jburel 'Review training example setup'
  - PR 6208 joshmoore 'test_user: don't assume single-threaded (see ome#6206)'

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