eliminated restriction src[i].channels() == 1 in cv::merge
fixed bug in cv::ocl::predictOptimalVectorWidth
Merge pull request #2494 from ilya-lavrenov:tapi_merge