merge dev_5_0 -D org: PR 2917 (Make hql output more consistent (rebased onto dev_5_0))
merge dev_5_0 -D org

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

Merged PRs:
  # PR 2917 ximenesuk 'Make hql output more consistent (rebased onto dev_5_0)'

Repository: openmicroscopy/bioformats
Updating 5f987c0..3d7ad7f
Merged PRs (fast-forward):
  # PR 1256 sbesson 'Fix link to Volocity page'
  # PR 1251 melissalinkert 'Update POM version numbers to 5.0.4-SNAPSHOT'

Merged PRs:
  # PR 1238 melissalinkert 'Autogen: prevent ClassNotFoundException from being needlessly thrown'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating c1fef5b..6cc998e
Merged PRs (fast-forward):
  # PR 926 dpwrussell 'Documentation for network hopping for developer laptops (rebased onto dev_5_0)'
  # PR 928 joshmoore 'Include LDAP OR docs from Jake Carroll'
  # PR 927 sbesson 'Fix memory command on server upgrade page'

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