Revert "Split OMEROWrapper to CachingWrapper for directory use"

This reverts commit 6f69e3843e790b0481cae71e032d789984cf8cbe.

Conflicts:

	components/romio/src/ome/io/bioformats/CachingWrapper.java
	components/romio/src/ome/io/nio/PixelsService.java
Revert "General OMEROWrapper refactorization for passing directory"

This reverts commit d37c4c7806ccd81013eeaaf7940e05c4db2328f3.
Minimal refactoring; limits where Memoizers are created

There is almost certainly more cleanup that can be done in terms of
where the reader stack is constructed and how it is stored.  This is at
least a start, and is hopefully safe and minimally invasive.

See #10750.
Merge pull request #19 from melissalinkert/memoizer-refactoring

Memoizer refactoring
merge develop -D org -I include -E exclude: PR 972 (Repository API)
merge develop -D org -I include -E exclude: PR 1030 (xsd-fu: Remove)
merge develop -D org -I include -E exclude: PR 1034 (Fix Homebrew uninstallation (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1047 (Upload)
merge develop -D org -I include -E exclude: PR 1048 (Add upload time remaining to Insight (see #10689))
merge develop -D org -I include -E exclude: PR 1049 (Specification removal)
merge develop -D org -I include -E exclude: PR 1051 (CLI: Improve group arguments allowing to specify input type (see #10677) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1055 (OriginalMetadata_FS_web_10349)
merge develop -D org -I include -E exclude: PR 1056 (Download develop)
merge develop -D org -I include -E exclude: PR 1058 (Fs file caching (#10535))
merge develop -D org -I include -E exclude: PR 1059 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1060 (Big Image levels=re.getResolutionLevels(). Fixes #10681)
merge develop -D org -I include -E exclude: PR 1061 (Display "Import Log" button after import (see #10676))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 972 knabar 'Repository API'
  # PR 1030 rleigh-dundee 'xsd-fu: Remove'
  # PR 1034 sbesson 'Fix Homebrew uninstallation (rebased onto develop)'
  # PR 1047 jburel 'Upload'
  # PR 1048 bpindelski 'Add upload time remaining to Insight (see #10689)'
  # PR 1049 rleigh-dundee 'Specification removal'
  # PR 1051 sbesson 'CLI: Improve group arguments allowing to specify input type (see #10677) (rebased onto develop)'
  # PR 1055 will-moore 'OriginalMetadata_FS_web_10349'
  # PR 1056 jburel 'Download develop'
  # PR 1058 joshmoore 'Fs file caching (#10535)'
  # PR 1059 snoopycrimecop 'Update develop submodules'
  # PR 1060 will-moore 'Big Image levels=re.getResolutionLevels(). Fixes #10681'
  # PR 1061 bpindelski 'Display "Import Log" button after import (see #10676)'
Conflicting PRs (not included):
  # PR 1062 ximenesuk 'Import log'
  # PR 1064 jburel 'Download image metadata develop'

Repository: openmicroscopy/bioformats
Updating ea59e4a..59e7d99
Merged PRs:
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 427 rleigh-dundee 'xsd-fu: Generate sources at build time'
  # PR 433 melissalinkert 'More .nd2 fixes (rebased onto develop)'
  # PR 465 joshmoore 'Kryo memoizer'
  # PR 467 qidane 'Revert "Adding Transform to Image, see #3742"'
  # PR 468 rleigh-dundee 'scifio: Add BaseMetadata'

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

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

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