Final lot of Javadoc fixes [8/8]

- also merged upstream for committing purposes