Merge pull request #1062 from ximenesuk/import-log

Import log
Fix NPE in OMRI.java (Fix #10820)

A later check tests for the fileset to be null,
but the returned array can still be empty requiring
an earlier check.
Fileset thumb selects image if in tree
Keep fileset thumbs 'shown' on selection change
merge develop -D org -I include -E exclude: PR 1049 (Specification removal)
merge develop -D org -I include -E exclude: PR 1075 (Connection (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1080 (Re-raise javac.maxmem to 600m (Fix #10688))
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 1113 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1116 (Fix IOOB when importing MIFs (see #10772))
merge develop -D org -I include -E exclude: PR 1118 (Fix NPE in OMRI.java (Fix #10820))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1049 rleigh-dundee 'Specification removal'
  # PR 1075 jburel 'Connection (rebased onto develop)'
  # PR 1080 joshmoore 'Re-raise javac.maxmem to 600m (Fix #10688)'
  # 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 1113 snoopycrimecop 'Update develop submodules'
  # PR 1116 bpindelski 'Fix IOOB when importing MIFs (see #10772)'
  # PR 1118 joshmoore 'Fix NPE in OMRI.java (Fix #10820)'
Conflicting PRs (not included):
  # PR 972 knabar 'Repository API'

Repository: openmicroscopy/bioformats
Updating 2287f2d..b25170f
Merged PRs:
  # PR 482 rleigh-dundee 'Remove 2003fc and related classes'
  # PR 485 melissalinkert 'Fix export of multiple files (rebased onto develop)'
  # PR 494 melissalinkert 'Add kryo-2.21-shaded.jar to loci_tools.jar'

Repository: ome/scripts
Updating 46fba5e..9a3b42e

Repository: openmicroscopy/ome-documentation
Updating 12e5143..c1d72ce
Merged PRs:
  # PR 345 sbesson 'Review Matlab documentation (see #10389) (rebased onto develop)'

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