Handle correctly to void duplicate thumbnails (see #10225)
Review error handling when creating thumbnail after import

Make sure the error is logged in.
Add OMERO_API to all upCast declarations
chgrp.cpp: Use IceUtil::Handle only

Also fix regression in the return type of cb->block which
is now bool.
omero::client: Remove unused include
test/unit/client.cpp: Don't create an omero::client on the stack
OmeroCpp: Correct line endings to use LF only
Fix deleteRepoDeleteLogs (SQL/tx)
Add AssumeNG to repository (see #10238)
Update Blitz.setChannelNames doc
Hide channel-edit button while editing
Update confirm message and 'Continue' button
Fix channel naming NPE when no $.jstree. Reported in PR 606
Show warning message renaming Well channels on 'Enter'

Conflicts:

	components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
Fix tooltip caps and non-ascii characters
Don't try to cast unicode Channel name to str()
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 592 (C++ fixes for building with Ice >= 3.4)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 599 (scons: Update to version 2.2.0)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 623 (Insight sprint2 (rebased onto develop))