[jdk17u-dev] RFR: 8285727: Unify fix for JDK-8284920 with version from head

[Christoph Langer]

The upstream patch for JDK-8284920 differs from the version in jdk17u-dev.
The change in head seems a bit more elegant. Also, the upstream change has a test.
So we should update jdk17u with the version from head.

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

Commit messages:
 - Update JDK-8284920 patch with upstream changes.

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

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