Merge pull request #6078 from PolarNick239:master

diff --cc modules/java/generator/gen_java.py
Simple merge

diff --cc modules/python/src2/cv2.cpp
Simple merge

diff --cc modules/python/src2/gen2.py
Simple merge

diff --cc modules/python/test/test.py
index a2d3698,2011e30..5a66769
mode 100755,100644..100755
--- 1/modules/python/test/test.py
--- 2/modules/python/test/test.py
+++ b/modules/python/test/test.py
@@@ -133,10 -219,6 +187,10 @@@ if __name__ == '__main__'
      print("Testing OpenCV", cv2.__version__)
      print("Local repo path:", args.repo)
      NewOpenCVTests.repoPath = args.repo
 +    try:
 +        NewOpenCVTests.extraTestDataPath = os.environ['OPENCV_TEST_DATA_PATH']
 +    except KeyError:
 +        print('Missing opencv extra repository. Some of tests may fail.')
      random.seed(0)
      unit_argv = [sys.argv[0]] + other;
-     unittest.main(argv=unit_argv)
+     unittest.main(argv=unit_argv)