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_parsing_runme.py

@@ -6,25 +6,25 @@ import sys
 import commentVerifier
 
 commentVerifier.check(doxygen_parsing.someFunction.__doc__,
-r"""
-  The function comment
-  """)
+    r"""
+    The function comment
+    """)
 commentVerifier.check(doxygen_parsing.SomeClass.__doc__,
-r"""
+    r"""
     The class comment
     """)
 commentVerifier.check(doxygen_parsing.SomeStruct.__doc__,
-r"""
+    r"""
     The struct comment
     """)
 commentVerifier.check(doxygen_parsing.SomeAnotherClass.classMethod.__doc__,
-r"""
+    r"""
         The class method comment.
 
         SomeAnotherClass#classMethodExtended(int, int) a link text 
         """)
 commentVerifier.check(doxygen_parsing.SomeAnotherClass.classMethodExtended.__doc__,
-r"""
+    r"""
         The class method with parameter
 
         Arguments:
@@ -33,7 +33,7 @@ r"""
         """
 )
 commentVerifier.check(doxygen_parsing.SomeAnotherClass.classMethodExtended2.__doc__, 
-r"""
+    r"""
         The class method with parameter
 
         Arguments:
@@ -42,11 +42,11 @@ r"""
         """
 )
 commentVerifier.check(doxygen_parsing.SomeAnotherStruct.structMethod.__doc__,
-r"""
+    r"""
         The struct method comment
         """)
 commentVerifier.check(doxygen_parsing.SomeAnotherStruct.structMethodExtended.__doc__,
-r"""
+    r"""
         The struct method with parameter
 
         Arguments:
@@ -55,7 +55,7 @@ r"""
         """
 )
 commentVerifier.check(doxygen_parsing.SomeAnotherStruct.structMethodExtended2.__doc__,
-r"""
+    r"""
         The struct method with parameter
 
         Arguments: