Fixed problem with compilation without HAVE_OPENCL

When compiling without OpenCL, some classes from its namespace are still used in code.
Fixed trailing whitespace
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
Merge pull request #2556 from DeanF:master
Merge pull request #2567 from apavlenko:fix_compare_scalar