Fix xfeatures2d dependencies
Merge pull request #3239 from mshabunin:xfeatures2d_fix