A clean backport of https://bugs.openjdk.org/browse/JDK-8362572.
Testing in progress. The change is quite straightforward and has been in tip for over a month. Should be safe. ------------- Commit messages: - Backport 7d7d308d9ab6f06ebdab0f5967a5bfc007d4217f Changes: https://git.openjdk.org/jdk/pull/26975/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=26975&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8362572 Stats: 27 lines in 1 file changed: 2 ins; 21 del; 4 mod Patch: https://git.openjdk.org/jdk/pull/26975.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/26975/head:pull/26975 PR: https://git.openjdk.org/jdk/pull/26975
