Fix javadoc and improve pre-java5 code
Authored by: michaudm 2020-12-28
Parent: [r6663]
Child: [r6665]