Fixed javadoc errors/warnings.
Merge branch '2.1-dev' into 3.0-dev