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/java/generator/src/cpp/common.h

@@ -32,4 +32,4 @@
 #  pragma warning(disable:4800 4244)
 #endif
 
-#endif //__JAVA_COMMON_H__
+#endif //__JAVA_COMMON_H__

modules/java/generator/src/cpp/core_manual.cpp

@@ -14,4 +14,4 @@ void cv::setErrorVerbosity(bool verbose)
         cv::redirectError(0);
     else
         cv::redirectError((cv::ErrorCallback)quietCallback);
-}
+}

modules/java/generator/src/cpp/jni_part.cpp

@@ -63,4 +63,4 @@ JNI_OnUnload(JavaVM*, void*)
   //do nothing
 }
 
-} // extern "C"
+} // extern "C"

modules/java/generator/src/cpp/utils.cpp

@@ -158,4 +158,4 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap
 
 } // extern "C"
 
-#endif //__ANDROID__
+#endif //__ANDROID__

modules/java/generator/src/java/android+sync.py

@@ -4,4 +4,4 @@ import os
 import shutil
 
 for f in os.listdir("."):
-    shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));
+    shutil.copyfile(f, os.path.join("../../../../../../modules/java/generator/src/java/", "android+" + f));

modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl

@@ -30,4 +30,4 @@ interface OpenCVEngineInterface
     * @return Returns names of OpenCV libraries, separated by semicolon.
     */
     String getLibraryList(String version);
-}
+}