#14299 Some Javadoc cleanup