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