[jdk11u-dev] RFR: 8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head

[Christoph Langer]

Hi all,

This pull request contains a backport of commit [c464f20f](https://github.com/openjdk/jdk17u-dev/commit/c464f20f41ff8b6b7eb3f1357f9bd5fcd51b13cb) from the [openjdk/jdk17u-dev](https://git.openjdk.java.net/jdk17u-dev) repository to backport [JDK-8285726](https://bugs.openjdk.java.net/browse/JDK-8285726).

The commit being backported was authored by Christoph Langer on 6 May 2022 and was reviewed by Martin Doerr.

Thanks!

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

Commit messages:
 - Backport c464f20f41ff8b6b7eb3f1357f9bd5fcd51b13cb

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/1073/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=1073&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8285726
  Stats: 136 lines in 3 files changed: 82 ins; 53 del; 1 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/1073.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/1073/head:pull/1073

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