Fix brute_force_matcher's hung on some Intel CPU OCL
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM