client.java: set default encoding in Ice 3.5
client.cpp: fix copyright header
client.cpp: fix whitespace
client.cpp: set default encoding in Ice 3.5
client.py: set default encoding in Ice 3.5
client.{java,py}: >= for intVersion check
client.java: fix copyright header
Temporary StringUtils import

gh-1671 was omitted due to a conflict. In order to
have the rest of the build passing, however, this
import must be present.
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1359 (testGetTile() checks against getPlane(). See #11315)
merge develop -D org -I include -E exclude: PR 1385 (Update the OMERO VirtualBox image)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1501 (10618 priv thumbs (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1633 (Upgrade ICE jars to version 3.5.1)
merge develop -D org -I include -E exclude: PR 1638 (OmeroCpp: Add cmake build system to replace scons)
merge develop -D org -I include -E exclude: PR 1641 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1645 (Prevent changing originalfile.mimetype from 'Directory')
merge develop -D org -I include -E exclude: PR 1647 (Fixing the drag behaviour on tiled images for IE (see #11555))
merge develop -D org -I include -E exclude: PR 1652 (Parse modulo and view moduloT)
merge develop -D org -I include -E exclude: PR 1653 (fix #11202: introduce suggestChecksumAlgorithm method to FS API)