Revert "Merge pull request #1779 from perping:integral_2.4"

This reverts commit 54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to 28e0d3d771d9db9d03ea55f8d0504558e17139b2.
- fix test
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"

This reverts commit 3dcddad88aa13b729313939648c29f420a9f8054.

Conflicts:
	modules/ocl/src/opencl/haarobjectdetect.cl