Pass logfile OriginalFile ID back in some event notifications.
Fix query in Metadata service implementation.
Update JavaDoc.
Clean up imports.
Add logic for creating image-companion links
Pass clientuuid on RawFileStoreI.__redirect

Without the client's uuid, it's not possible for
setFileId to be called.
Provide clientUuid in ManagedImportRequestI
Refactor log/annotation methods for concurrency

The mix of internal (ome.model) and external (omero.model)
calls in ManagedImportRequestI was leading to strange
concurrency issues. By moving all of the calls into
essentially other transactions, this should be resolved.
Use IUpdate for size update rather than RFS

Despite the work on the clientUuid, use of RFS with
repo files is still not viable in this use case because
a default of "r" is used by Repository.fileById. Rather
than introduce an "omero.rfs.write" context variable at
this point, we're just using IUpdate.
Merge remote-tracking branch 'jm/import-callback' into merged-fs-fixes

Conflicts:
	components/blitz/src/ome/formats/importer/ImportLibrary.java

Moved the log loading to a single method call from the constructor
since the log file is now created much earlier.
Merge commit '30c0eeb1ba58f08e1863cf472f79972c42885ac3' into merged-fs-fixes

Conflicts:
	components/blitz/src/ome/formats/OMEROMetadataStoreClient.java

Import errors (again)
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1133 (Code and mapping changes for new schema)
merge develop -D org -I include -E exclude: PR 1136 (blitz: Use MetadataRoot in MetadataStore implementations)
merge develop -D org -I include -E exclude: PR 1187 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1191 (Import callback)
merge develop -D org -I include -E exclude: PR 1195 (CLI: handle MIF exceptions (#10783))
merge develop -D org -I include -E exclude: PR 1196 (Add 2-Fileset delete tests - both failing)
merge develop -D org -I include -E exclude: PR 1197 (Thumbs table text white on selection)