OMERO.web unit and integration test fixes (develop)

#2319 rebased onto `develop`.