Minor adjustments not affecting behavior.
fix #10782: add IContainer.getImagesBySplitFilesets
batch the other HQL queries and fix indent
fix NPE with fileset-less images
adjust API method arguments as suggested by Jean-Marie
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1195 (CLI: handle MIF exceptions (#10783))
merge develop -D org -I include -E exclude: PR 1200 (Fake screen ome)
merge develop -D org -I include -E exclude: PR 1203 (Show Activities panel with new errors)
merge develop -D org -I include -E exclude: PR 1210 (Chgrp target 10908)
merge develop -D org -I include -E exclude: PR 1214 (fix #10782: add IContainer.getImagesBySplitFilesets)
merge develop -D org -I include -E exclude: PR 1219 (Submit failure)
merge develop -D org -I include -E exclude: PR 1220 (Add target for building virtual image)
merge develop -D org -I include -E exclude: PR 1221 (Split mif warnings)
merge develop -D org -I include -E exclude: PR 1222 (Add scc travis-merge to the Travis before_install step)
merge develop -D org -I include -E exclude: PR 1223 (11000 companion constraints)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1195 sbesson 'CLI: handle MIF exceptions (#10783)'
  # PR 1200 qidane 'Fake screen ome'
  # PR 1203 will-moore 'Show Activities panel with new errors'
  # PR 1210 will-moore 'Chgrp target 10908'
  # PR 1214 mtbc 'fix #10782: add IContainer.getImagesBySplitFilesets'
  # PR 1219 jburel 'Submit failure'
  # PR 1220 sbesson 'Add target for building virtual image'
  # PR 1221 will-moore 'Split mif warnings'
  # PR 1222 sbesson 'Add scc travis-merge to the Travis before_install step'
  # PR 1223 joshmoore '11000 companion constraints'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 475 qidane 'Fake screens'
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 529 melissalinkert 'Still more bug fixes'
  # PR 533 qidane 'Adding kryo jar to classpath for 10.7 compile'
  # PR 534 melissalinkert 'Revert "MetadataTools: Remove deprecated and unused methods"'
  # PR 535 sbesson 'Add Compression/BigTiff option to bfsave (rebased onto develop)'
Conflicting PRs (not included):
  # PR 536 joshmoore 'Add fake companion file (.fake.properties) (Fix #10993)'

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

Repository: openmicroscopy/ome-documentation
Updating 83ebb91..ba793fd
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 376 kennethgillen 'URL of Virtual Appliance changed to release downloads page, instead of Daily Builds.'

Generated by OMERO-merge-develop#292 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/292/)