Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/java/generator/gen_java.py

@@ -787,6 +787,7 @@ class JavaWrapperGenerator(object):
                             inCode = True
                         if "</code>" in line:
                             inCode = False
+                        line = line.replace('@result ', '@return ')  # @result is valid in Doxygen, but invalid in Javadoc
                         if "@return " in line:
                             returnTag = True