Merge remote-tracking branch 'gh-ome/develop' into fake-screen-ome
Do not enter interactive mode if hql command output is piped

Return the output if sys.stdout.isatty() is False, i.e. when the hql command
is either piped or redirected to a file.
Use btm prepared statement cache (See #11033)

Suggestion on the list was that the time to remove
the 1K or 10K uncached prepared statements from the
single collection was causing the long hangs. Here,
we've moved up to btm 2.1.3 and set the prepared
statement cache to 10 by default. (Note: for some
DBs this will require more active connections)
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 1219 (Submit failure)
merge develop -D org -I include -E exclude: PR 1221 (Split mif warnings)
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 1235 (fix #10890: extend blitz preprocessor to containers)
merge develop -D org -I include -E exclude: PR 1236 (Import bugs)
merge develop -D org -I include -E exclude: PR 1239 (Use omero.version to generate the ova name (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1240 (script_utils.getObjects() sorts by IDs develop)
merge develop -D org -I include -E exclude: PR 1242 (Fix multi-selection in data manager (see #11037))
merge develop -D org -I include -E exclude: PR 1243 (Use btm prepared statement cache (See #11033))