merge develop -Dnone -Ihotfix -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  - PR 6262 manics 'Documentation for ome/omero-py#272' (user: manics)
  - PR 6260 kkoz 'Add slice examples for reading data from Omero Tables' (user: kkoz)
  - PR 6256 jburel 'point to guides' (user: jburel)
  - PR 6247 will-moore 'Add chown web test' (user: will-moore)
  - PR 6212 jburel 'add test to import images' (user: jburel)
  - PR 6176 sbesson 'Restore CLI DB integration tests' (user: sbesson)
  - PR 6101 dominikl 'Set namespace of fileannoation of omero.table - test' (user: dominikl)
  - PR 6086 manics 'Alternative JSON configuration system for OMERO.web' (user: manics)
  - PR 5966 joshmoore 'Allow testing multiple builds in travis' (user: joshmoore)
Already up-to-date.

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