[jdk8u-dev] RFR: 8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head

[Yuri Nesterenko]

I need to backport this fix prepared by Christoph Langer to jdk8u, too. Without it, further backports using Token would be painful. The fix is not technically a backport from upstream for obvious reason so it would require review etc.

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

Commit messages:
 - 8285727: [11u, 17u] Unify fix for JDK-8284920 with version

Changes: https://git.openjdk.java.net/jdk8u-dev/pull/64/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk8u-dev&pr=64&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8285727
  Stats: 132 lines in 4 files changed: 122 ins; 0 del; 10 mod
  Patch: https://git.openjdk.java.net/jdk8u-dev/pull/64.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk8u-dev pull/64/head:pull/64

PR: https://git.openjdk.java.net/jdk8u-dev/pull/64