Merge remote-tracking branch 'jm/move-delete-mif' into morning-merge
Attempt to fix test compile error
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 1168 (fix #10811: add templatePrefix to Fileset)
merge develop -D org -I include -E exclude: PR 1200 (Fake screen ome)
merge develop -D org -I include -E exclude: PR 1223 (11000 companion constraints)
merge develop -D org -I include -E exclude: PR 1227 (OMERO.matlab: add functions to write and link file annotations (see #10385) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1228 (add note in mapping file about checksum documentation)
merge develop -D org -I include -E exclude: PR 1231 (Move delete mif)
merge develop -D org -I include -E exclude: PR 1232 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1243 (Use btm prepared statement cache (See #11033))
merge develop -D org -I include -E exclude: PR 1244 (Do not enter interactive mode if hql command output is piped)
merge develop -D org -I include -E exclude: PR 1247 (Provide SYSTEM priority thread executor for reload (See #11033))
merge develop -D org -I include -E exclude: PR 1251 (Improve the logging during image import (see #11020))
merge develop -D org -I include -E exclude: PR 1252 (Insight locking)
merge develop -D org -I include -E exclude: PR 1253 (Plate import)
merge develop -D org -I include -E exclude: PR 1256 (11054 on2 delete)
merge develop -D org -I include -E exclude: PR 1257 (Thumbnailbean)
merge develop -D org -I include -E exclude: PR 1259 (Import notification)