[jdk11u-dev] RFR: Merge jdk11u:master

[Goetz Lindenmaier]

Merge build tag 11.0.20+6 from jdk11u to jdk11u-dev

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

Commit messages:
 - Merge
 - 8309476: [11u] tools/jmod/hashes/HashesOrderTest.java fails intermittently
 - 8304291: [AIX] Broken build after JDK-8301998

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

Changes: https://git.openjdk.org/jdk11u-dev/pull/1945/files
  Stats: 7 lines in 3 files changed: 6 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1945.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/1945/head:pull/1945

PR: https://git.openjdk.org/jdk11u-dev/pull/1945