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 1027 (Adding note about openjdk8 not being supported (rebased onto develop))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating d7681c9..9353dcf
Previously merged:
  # PR 1014 bpindelski 'Ldap.txt: cleanup and update column names.'
  # PR 1022 hflynn 'In-place import user & group set-up plus minor tidy'
  # PR 1021 sbesson 'Review documentation for release infrastructure'
  # PR 1024 hflynn 'Variable names in example are swapped (rebased onto develop)'

Merged PRs:
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64'
  # PR 1027 hflynn 'Adding note about openjdk8 not being supported (rebased onto develop)'

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