[jdk11u-dev] RFR: 8291794: [11u] Repair backport of JDK-8211727 [v3]

[George Adams]

> This change allows me to merge https://github.com/openjdk/jdk/commit/1804d6ce65816a529489e3058d9a035d8f772f61  and https://github.com/openjdk/jdk/commit/753c58b7f556fedd7828da487a34b8b228785ff9 cleanly

George Adams has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision:

  Repair backport of JDK-8211727

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

Changes:
  - all: https://git.openjdk.org/jdk11u-dev/pull/1302/files
  - new: https://git.openjdk.org/jdk11u-dev/pull/1302/files/1540f710..91b6da48

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1302&range=02
 - incr: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1302&range=01-02

  Stats: 3 lines in 1 file changed: 3 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1302.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev pull/1302/head:pull/1302

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