ParametersI.h: Work around Ice bug in ParametersIPtr typedef
templates/combined.vm: Work around Ice bug in ${PojoI}Ptr typedef

I'm not happy with this patch.  The seemingly arbitrary escaping
of the leading '#' seems wrong, even if it does result in correct
generated output.  Is there a better way to do this?
Improve error handling during import (See #10090)
Correct indentation (wrt. PR 458)
Merge pull request #585 from jburel/rebased/develop/viewer-big

No longer remove tabs if big images. (close #10035) (rebased onto develop)
merge develop --exclude conflict needs-fixes broken: PR 577 (9821 Major FS refactoring)
merge develop --exclude conflict needs-fixes broken: PR 584 (Fixing ome.postit aop handler functions)
merge develop --exclude conflict needs-fixes broken: PR 586 (Fix initialisation of username on Windows (rebased onto develop))
merge develop --exclude conflict needs-fixes broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop --exclude conflict needs-fixes broken: PR 588 (Print win service info in admin diagnostics (rebased onto develop))
merge develop --exclude conflict needs-fixes broken: PR 590 (Build fix: update bioformats submodule pointer)
merge develop --exclude conflict needs-fixes broken: PR 592 (C++ fixes for building with Ice >= 3.4)
merge develop --exclude conflict needs-fixes broken: PR 593 (Improve error handling during import (See #10090) (rebased onto develop))
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 577 joshmoore '9821 Major FS refactoring'
  # PR 584 cneves 'Fixing ome.postit aop handler functions'
  # PR 586 bpindelski 'Fix initialisation of username on Windows (rebased onto develop)'
  # PR 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 588 bpindelski 'Print win service info in admin diagnostics (rebased onto develop)'
  # PR 590 melissalinkert 'Build fix: update bioformats submodule pointer'
  # PR 592 rleigh-dundee 'C++ fixes for building with Ice >= 3.4'
  # PR 593 jburel 'Improve error handling during import (See #10090) (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 55cf7fd..92b0103
Merged PRs:
  # PR 320 melissalinkert 'ImageJ plugin option improvements'
  # PR 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'
  # PR 329 melissalinkert 'Sort original metadata keys ending with an index'
  # PR 338 melissalinkert 'Slidebook channel count (develop)'

Repository: ome/scripts
Updating 457e85a..272c83a

Repository: openmicroscopy/ome-documentation
Updating 2e32665..66b4162
Merged PRs:
  # PR 203 hflynn '9993 fix develop'
  # PR 205 jburel 'Fix typo and broken links. (rebased onto develop)'

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