Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

doc/tutorials/features2d/feature_description/feature_description.rst

@@ -100,6 +100,3 @@ Result
    .. image:: images/Feature_Description_BruteForce_Result.jpg
       :align: center
       :height: 200pt
-
-
-

doc/tutorials/features2d/table_of_content_features2d/table_of_content_features2d.rst

@@ -201,4 +201,3 @@ Learn about how to use the feature points  detectors, descriptors and matching f
    ../feature_flann_matcher/feature_flann_matcher
    ../feature_homography/feature_homography
    ../detection_of_planar_objects/detection_of_planar_objects
-

doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst

@@ -135,4 +135,3 @@ Here is the result:
 
 .. image:: images/Corner_Subpixeles_Result.jpg
               :align: center
-

doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst

@@ -37,4 +37,3 @@ Result
 
 .. image:: images/My_Shi_Tomasi_corner_detector_Result.jpg
               :align: center
-

doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst

@@ -118,5 +118,3 @@ Result
 
 .. image:: images/Feature_Detection_Result_a.jpg
               :align: center
-
-

doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst

@@ -243,5 +243,3 @@ The detected corners are surrounded by a small black circle
 
 .. image:: images/Harris_Detector_Result.jpg
               :align: center
-
-