merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 973 (Team workflow doc)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 988 (Property index)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 990 (for users who have compiled isapi_wsgi on x64)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 991 (updating documentation to use new glosary)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 6b9707e..1cf122e
Previously merged:
  # PR 995 mtbc 'add note for omero.jvmcfg.* setters about admin jvmcfg'
  # PR 992 ximenesuk 'Add disk usage sections to cli pages.'

Merged PRs:
  # PR 973 hflynn 'Team workflow doc'
  # PR 988 sbesson 'Property index'
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64'
  # PR 991 aleksandra-tarkowska 'updating documentation to use new glosary'

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