Revert "Fix ONEE during in-place import."

This reverts commit fb58e1159fda3e013593c3d6f0288b0794742509.

Conflicts:
	components/blitz/src/ome/formats/importer/transfers/AbstractExecFileTransfer.java
Remove ACTIVE_CLOSE.
OmeroCpp: Group code into folders
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating 126e167..c6fa36a
Previously merged:
  # PR 1325 melissalinkert 'Update POM version numbers to 5.1.0-m1'
  # PR 1327 snoopycrimecop 'Update auto-generated documentation'
  # PR 1321 sbesson 'Improve Javadoc of Memoizer.java'
  # PR 1310 hflynn 'Add 32-bit only note to QTJava'
  # PR 1316 rleigh-dundee 'travis: Remove openjdk7'
  # PR 1252 imunro 'Add Example code or writing Plate data to ome-tiff.'
  # PR 1304 imunro 'Correct timebase for picoQuant .bin files.'
  # PR 1312 melissalinkert 'Update release notes for 5.0.4 (rebased onto develop)'
  # PR 1313 melissalinkert 'Fix CLI tools when used from a source working copy (rebased onto develop)'

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

Repository: openmicroscopy/ome-documentation
Updating ee4c2a5..4605edd
Previously merged:
  # PR 974 bpindelski 'Update IIS app pool setting doc (fix #12504).'
  # PR 980 snoopycrimecop 'Update auto-generated properties'
  # PR 978 sbesson 'Add description of staging help job'
  # PR 977 sbesson 'Fix signature of linkAnnotation in OMERO.matlab documentation page'
  # PR 976 jburel 'Contributing'

Generated by OMERO-5.1-latest-submods#188 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/188/)
Merge pull request #3006 from snoopycrimecop/develop/latest/submodules

Update develop submodules
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2835 (Update OmeroPy/src/path.py)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2895 (Reload groups after users added/removed)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2926 (OmeroCpp: Glob test sources)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2927 (OmeroCpp: Glob example sources)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2963 (Discover LDAP users server-side (fix #12511).)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2970 (Bugfixes for 5 0 4)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2972 (show multiple objects)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2979 (Thumbnail cache busting)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2982 (Fix #12530: detect Windows if closing RFS.)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 2994 (Ensure that identity request variables are UTF-8 encoded)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3002 (CLI: migrate integration tests as unit tests)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3004 (Update webadmin_utils.py with downloads.o.org link instead of trac.o.org )
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3005 (Rendering settings unification)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3008 (OmeroPy: src flake8 (II))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3009 (Add a disk usage plugin)