Reduce no. of broken integration tests.

This PR should reduce the number of failing tests in http://ci.openmicroscopy.org/job/OMERO-5.1-merge-integration-broken/ by 11. At the same time it should increase the number of passing tests in http://ci.openmicroscopy.org/job/OMERO-5.1-merge-integration-java/ by 11.