[jdk17u-dev] RFR: 8285726: Unify fix for JDK-8284548 with version from head

[Christoph Langer]

The upstream patch for JDK-8284548 differs from the version in jdk17u-dev.
In particular the testcase is different. So I think we should update to the code in head to reduce diffs.

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

Commit messages:
 - JDK-8285726

Changes: https://git.openjdk.java.net/jdk17u-dev/pull/372/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk17u-dev&pr=372&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/jdk17u-dev/pull/372.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk17u-dev pull/372/head:pull/372

PR: https://git.openjdk.java.net/jdk17u-dev/pull/372