[jdk21u-dev] RFR: 8341412: Various test failures after JDK-8334305

[Goetz Lindenmaier]

I backport this for parity with 21.0.7-oracle.

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

Depends on: https://git.openjdk.org/jdk21u-dev/pull/1334

Commit messages:
 - Backport 49501fe9c4d0fc4d6285ba4f5d403754e5a147bd

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

PR: https://git.openjdk.org/jdk21u-dev/pull/1335