Fix the javadoc so that the XML snippet is generated correctly.
Merge remote-tracking branch 'origin/4.3' into 4.3