fix javadoc errors found by OpenJDK 7
Merge pull request #2085 from yanns/javadoc

fix javadoc errors found by OpenJDK 7
Merge remote-tracking branch: upstream/master