Changes

merge develop -Dorg -Ssuccess-only

Repository: ome/openmicroscopy
Excluded PRs:
  - PR 6423 jburel 'Use \d' (status: failure)
  - PR 6212 jburel 'add test to import images' (exclude comment)
Already up to date.

Generated by OMERO-push#60 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-push/60/)

Add version.properties to etc/omero.properties