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

[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.

Christoph Langer has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains two additional commits since the last revision:

 - Merge branch 'master' into jdk-8285726
 - JDK-8285726
   
   Update JDK-8284548 patch with upstream changes.

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

Changes:
  - all: https://git.openjdk.java.net/jdk17u-dev/pull/372/files
  - new: https://git.openjdk.java.net/jdk17u-dev/pull/372/files/807eeb6e..516798e5

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=jdk17u-dev&pr=372&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=jdk17u-dev&pr=372&range=00-01

  Stats: 1242 lines in 32 files changed: 1060 ins; 152 del; 30 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