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 903 (Add switch-group info to user CLI page)
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)
Updating 6ba46f8..8848b4f
Merged PRs (fast-forward):
  # PR 896 joshmoore 'Remove limitations'
  # PR 902 sbesson '5.0.3: CLI documentation (rebased onto develop) (rebased onto dev_5_0)'
  # PR 894 sbesson 'Added documentation for Active Directory LDAP'

Merged PRs:
  # PR 900 sbesson 'OMERO configuration properties'
  # PR 901 bpindelski 'Further clarification of in-place on Windows.'
  # PR 903 will-moore 'Add switch-group info to user CLI page'
Conflicting PRs (not included):
  # PR 910 ximenesuk 'Document CLI command fs'

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