[jdk11u-dev] RFR: Merge jdk11u:master

[Goetz Lindenmaier]

Merge build tag 11.0.13+7 from jdk11u to jdk11u-dev

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

Commit messages:
 - Merge
 - 8269850: Most JDK releases report macOS version 12 as 10.16 instead of 12.0

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

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/440/files
  Stats: 25 lines in 1 file changed: 7 ins; 13 del; 5 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/440.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/440/head:pull/440

PR: https://git.openjdk.java.net/jdk11u-dev/pull/440