Merge latest master into doxygen branch again.

Update Doxygen-specific Python unit tests to work with the new indentation.

Update one of Doxygen-specific Java tests to still build with the new handling
of srcdir.

Examples/test-suite/python/doxygen_translate_links_runme.py

@@ -8,35 +8,35 @@ import commentVerifier
 
 commentVerifier.check(doxygen_translate_links.function.__doc__,
 r"""
-  Testing typenames converting in @ link
+    Testing typenames converting in @ link
 
-  superFunc(int,std::string)
-  Test for std_string member
+    superFunc(int,std::string)
+    Test for std_string member
 
 
-  superFunc(int,long,void*)
-  Test for simple types
+    superFunc(int,long,void*)
+    Test for simple types
 
 
-  superFunc(Shape::superType*)
-  Test for custom types
+    superFunc(Shape::superType*)
+    Test for custom types
 
 
-  superFunc(int**[13])
-  Test for complex types
+    superFunc(int**[13])
+    Test for complex types
 
 
-  same works for 'See also:' links:
+    same works for 'See also:' links:
 
-  See also: superFunc(int,std::string)
-  See also: superFunc(int,long,void*)
-  See also: superFunc(Shape::superType*)
-  See also: superFunc(int**[13])
+    See also: superFunc(int,std::string)
+    See also: superFunc(int,long,void*)
+    See also: superFunc(Shape::superType*)
+    See also: superFunc(int**[13])
 
-  some failing params:
+    some failing params:
 
-  See also: superFunc()
-  See also: superFunc()
-  See also: superFunc()
+    See also: superFunc()
+    See also: superFunc()
+    See also: superFunc()
 
-  """)
+    """)