ocl: merge with upstream/2.4
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
ocl: update ocl samples
ocl: update module documentation