[jdk17u-dev] Integrated: Merge jdk17u:master

[Goetz Lindenmaier]

Merge needed as change was wrongly pushed to jdk17u.

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

Commit messages:


The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.java.net/jdk17u-dev/pull/413/files
  Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
  Patch: https://git.openjdk.java.net/jdk17u-dev/pull/413.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk17u-dev pull/413/head:pull/413

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