Fix some tests that failed due to OME upgrade
Merge branch 'master' of github.com:CellProfiler/CellProfiler