Clean backport -------------
Commit messages: - Backport 3790965df3e7cba3b9792b8719d1e2ead046da15 Changes: https://git.openjdk.org/jdk/pull/27773/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=27773&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8336695 Stats: 2579 lines in 122 files changed: 1451 ins; 118 del; 1010 mod Patch: https://git.openjdk.org/jdk/pull/27773.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/27773/head:pull/27773 PR: https://git.openjdk.org/jdk/pull/27773
