Fixed ISSUE-54454: Fix a couple of javadoc warnings coming up on jdk17

When running "ant generate.java.doc" as done in CI with jdk17 a few more warnings come up by default.

Fix those up (and a few simple more simple cases).