merge dev_5_0 -D org: PR 900 (OMERO configuration properties)
merge dev_5_0 -D org: PR 901 (Further clarification of in-place on Windows.)
merge dev_5_0 -D org: PR 910 (Document CLI command fs)
merge dev_5_0 -D org: PR 911 (Deprecate omero_client.jar.)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 899 rleigh-dundee 'Cpp: Document building with cmake (dev_5_0)' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 900 sbesson 'OMERO configuration properties'
  # PR 901 bpindelski 'Further clarification of in-place on Windows.'
  # PR 910 ximenesuk 'Document CLI command fs'
  # PR 911 bpindelski 'Deprecate omero_client.jar.'

Generated by OME-5.0-merge-push#137 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/137/)