Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.
Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.

Conflicts:
	modules/features2d/src/draw.cpp

opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv,opencv/opencv