Merge pull request #1549 from snoopycrimecop/merge/develop/submodules

Update develop submodules
Merge pull request #1560 from jburel/default-group-develop

Default group develop
Merge pull request #1552 from ximenesuk/rebased/develop/web_pytest_4_4

Moving omeroweb unittests to pytest
Remove unit tests from OmeroJava.
Organise imports and remove unused member.
Format whitespace and comments.
Remove usage of DeleteI.
Fix build with missing unit tests.
Increase the TestNG timeout for integration tests.
Clean imports, rename field in AbstractSrvTest.
Clean up unit test in blitz.
Fix possible NPE.
Clean up code.
Fix build by renaming a class member.
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 1452 (Update log4j jar.)