[jdk11u-dev] RFR: 8210726: Fix up a few minor nits forgotten by JDK-8210665

[Goetz Lindenmaier]

I backport this for parity with 11.0.14-oracle.

-------------

Commit messages:
 - Backport fddc4b8ccb8df5b15a92530fb1628e13452067ed

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/654/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=654&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8210726
  Stats: 14 lines in 4 files changed: 0 ins; 7 del; 7 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/654.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/654/head:pull/654

PR: https://git.openjdk.java.net/jdk11u-dev/pull/654