merge develop -Dnone -Ibreaking -Eexclude -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 991 aleksandra-tarkowska 'updating documentation to use new glosary' (user: aleksandra-tarkowska)
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64' (user: kennethgillen)
  # PR 988 sbesson 'Property index' (user: sbesson)
  # PR 973 hflynn 'Team workflow doc' (user: hflynn)
Updating 01a91b2..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.'
  # PR 989 sbesson 'Add paragraph about the store recycling while retrieving pixel data'
  # PR 986 sbesson 'Document usage of new OMERO_SESSION_DIR envvar for the CLI'
  # PR 987 snoopycrimecop 'Update auto-generated properties'
  # PR 984 aleksandra-tarkowska 'adding support for django directives'

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