Merge pull request #1118 from joshmoore/10820-npe-ormi

Fix NPE in OMRI.java (Fix #10820)
Fix argument to exception during callbacks.
Merge pull request #1120 from joshmoore/rebased/develop/integration-test-review

Integration test review (rebased onto develop)
Add some basic MIF chgrp tests.
Add some basic MIF delete tests.
Add further basic chgrp tests.
Restrict chgrp of filesets and return constraints (See #10776)

With this change filesets will no longer be moved along with
images, and the dangling filesets will cause the chgrp to
fail. The ids of the filesets causing this can be found in
the "constraints" field of the "omero.cmd.ChgrpERR" response.
Check delete after chgrp change
merge develop -D org -I include -E exclude: PR 1075 (Connection (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1092 (Fileset display)
merge develop -D org -I include -E exclude: PR 1093 (blitz: ExporterI no longer uses DOMUtil.writeXML)
merge develop -D org -I include -E exclude: PR 1096 (Thumbnail figure develop)
merge develop -D org -I include -E exclude: PR 1109 (fix #10671: make server handling of odd file paths more configurable)
merge develop -D org -I include -E exclude: PR 1115 (Review Java chgrp tests for MIF work (See #10777))
merge develop -D org -I include -E exclude: PR 1123 (Review Python chgrp/delete tests for MIF work (See #10777))
merge develop -D org -I include -E exclude: PR 1130 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1131 (Fix ZIP file path creation code (see #10804) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1075 jburel 'Connection (rebased onto develop)'
  # PR 1092 will-moore 'Fileset display'
  # PR 1093 rleigh-dundee 'blitz: ExporterI no longer uses DOMUtil.writeXML'
  # PR 1096 will-moore 'Thumbnail figure develop'
  # PR 1109 mtbc 'fix #10671: make server handling of odd file paths more configurable'
  # PR 1115 joshmoore 'Review Java chgrp tests for MIF work (See #10777)'
  # PR 1123 ximenesuk 'Review Python chgrp/delete tests for MIF work (See #10777)'
  # PR 1130 snoopycrimecop 'Update develop submodules'
  # PR 1131 bpindelski 'Fix ZIP file path creation code (see #10804) (rebased onto develop)'
  # PR 1132 knabar 'Repository API'
Conflicting PRs (not included):
  # PR 1133 qidane 'Code and mapping changes for new schema'

Repository: openmicroscopy/bioformats
Updating 750b4ab..2b51157
Merged PRs:
  # PR 482 rleigh-dundee 'Remove 2003fc and related classes'
  # PR 485 melissalinkert 'Fix export of multiple files (rebased onto develop)'
  # PR 496 ctrueden 'Fix some minor Ant build issues'
  # PR 503 melissalinkert 'GIF: add a few more things to the metadata table'
  # PR 504 melissalinkert 'Prevent false positives in open file handle test'
  # PR 506 melissalinkert 'Memoizer: use Location instead of File to represent 'id''

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 30 will-moore 'OME-TIFF_Big_Images_10761_develop'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 351 sbesson 'Address various Matlab documentation issues raised by Simon (rebased onto develop)'

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