[jdk11u-dev] RFR: 8334335: [TESTBUG] Backport of 8279164 to 11u & 17u includes elements of JDK-8163327

[Martin Doerr]

Clean backport of [JDK-8334335](https://bugs.openjdk.org/browse/JDK-8334335) from JDK 17u.

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

Commit messages:
 - Backport 5c3fc1d795a760e4cce55045cbcd2384d9007356

Changes: https://git.openjdk.org/jdk11u-dev/pull/2798/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2798&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8334335
  Stats: 2 lines in 1 file changed: 0 ins; 1 del; 1 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/2798.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/2798/head:pull/2798

PR: https://git.openjdk.org/jdk11u-dev/pull/2798