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

[Christoph Langer]

Hi all,

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

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

Thanks!

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

Commit messages:
 - Backport a95482acf83cc03bc562baace0d55d831d0b2b41

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

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