merge develop -D org: PR 929 ( DropBox configuration clarification (rebased onto develop))
merge develop -D org: PR 930 (Fix memory command on server upgrade page (rebased onto develop))
merge develop -D org: PR 932 (Update auto-generated properties)
merge develop -D org: PR 933 (Include LDAP OR docs from Jake Carroll (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 929 ximenesuk ' DropBox configuration clarification (rebased onto develop)'
  # PR 930 sbesson 'Fix memory command on server upgrade page (rebased onto develop)'
  # PR 932 sbesson 'Update auto-generated properties'
  # PR 933 hflynn 'Include LDAP OR docs from Jake Carroll (rebased onto develop)'

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