Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Author: alalek

testdata/dnn/download_models.py

@@ -222,11 +222,6 @@ def save(self, r):
         url='http://eecs.berkeley.edu/~rich.zhang/projects/2016_colorization/files/demo_v2/colorization_release_v2.caffemodel',
         sha='21e61293a3fa6747308171c11b6dd18a68a26e7f',
         filename='colorization_release_v2.caffemodel'),
-    Model(
-        name='Face_detector',
-        url='https://raw.githubusercontent.com/opencv/opencv/master/samples/dnn/face_detector/deploy.prototxt',
-        sha='006baf926232df6f6332defb9c24f94bb9f3764e',
-        filename='opencv_face_detector.prototxt'),
     Model(
         name='Face_detector',
         url='https://github.com/opencv/opencv_3rdparty/raw/dnn_samples_face_detector_20170830/res10_300x300_ssd_iter_140000.caffemodel',