Fix OMERO-merge-stable build.