COMP: Adapted ocl test to use a 2D image temporarily, because our mac continuous only supports 2D.
Merge branch 'bug-18303-Ocl2DTestForMacOs'