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/ts/misc/perf_tests_timing.py

@@ -156,4 +156,4 @@ if __name__ == "__main__":
             if not options.failedOnly:
                 print '\nOverall time: %.2f min\n' % overall_time
             tbl.consolePrintTable(sys.stdout)
-            print 2 * '\n'
+            print 2 * '\n'

modules/ts/misc/report.py

@@ -100,4 +100,4 @@ if __name__ == "__main__":
             tbl.htmlPrintTable(sys.stdout)
             htmlPrintFooter(sys.stdout)
     else:
-        tbl.consolePrintTable(sys.stdout)
+        tbl.consolePrintTable(sys.stdout)