[jdk21u-dev] RFR: Merge jdk21u:master

[Christoph Langer]

Merge back changes of jdk-21.0.4+6

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

Commit messages:
 - 8334441: Mark tests in jdk_security_infra group as manual

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

Changes: https://git.openjdk.org/jdk21u-dev/pull/794/files
  Stats: 156 lines in 8 files changed: 5 ins; 0 del; 151 mod
  Patch: https://git.openjdk.org/jdk21u-dev/pull/794.diff
  Fetch: git fetch https://git.openjdk.org/jdk21u-dev.git pull/794/head:pull/794

PR: https://git.openjdk.org/jdk21u-dev/pull/794