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 1418 (Use Python 2.6 features unconditionally)
merge develop -D org -I include -E exclude: PR 1421 (Import as bug develop)
merge develop -D org -I include -E exclude: PR 1465 (Omeroweb examples fixes develop)
merge develop -D org -I include -E exclude: PR 1466 (plate_thumbs_11160_develop)
merge develop -D org -I include -E exclude: PR 1504 (Training java (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1542 (Blitz integration tests (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1590 (Session uuid fixes (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1603 (fix #10894: increase realism of test pixel buffer)
merge develop -D org -I include -E exclude: PR 1617 (Fix the "integration" target in components/rendering. (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1622 (Change all tests under integration to use pytest idioms. (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1631 (Find the panojs wrapping weblitz viewport instead of using a fixed eleme...)
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 1635 (fix #11446: add robot framework scripts for testing the Insight data browser (rebased))
merge develop -D org -I include -E exclude: PR 1636 (fix #11518: update Insight UI context menu tests (rebased))
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 1640 (Add jar to classpath. (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1641 (Update develop submodules)