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

modules/legacy/test/test_bruteforcematcher.cpp

@@ -113,4 +113,3 @@ protected:
 };
 
 TEST(Legacy_BruteForceMatcher, accuracy) { CV_BruteForceMatcherTest test; test.safe_run(); }
-

modules/legacy/test/test_optflow.cpp

@@ -353,5 +353,3 @@ void CV_OptFlowTest::run( int /* start_from */)
 
 
 TEST(Legacy_OpticalFlow, accuracy) { CV_OptFlowTest test; test.safe_run(); }
-
-

modules/legacy/test/test_subdivisions.cpp

@@ -338,4 +338,3 @@ _exit_:
 TEST(Legacy_Subdiv, correctness) { CV_SubdivTest test; test.safe_run(); }
 
 /* End of file. */
-