fix javadoc errors found by OpenJDK 7
Merge remote-tracking branch 'origin/2.2.x' into 2.2.x
fix javadoc errors found by OpenJDK 7