[jdk11u-dev] RFR: 8290886 [11u]: Backport of JDK-8266250 introduced test failures

[George Adams]

Tested locally and confirmed that both tests now pass again.

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

Commit messages:
 - 8290886 [11u]: Backport of JDK-8266250 introduced test failures

Changes: https://git.openjdk.org/jdk11u-dev/pull/1265/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1265&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8290886
  Stats: 58 lines in 2 files changed: 36 ins; 2 del; 20 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1265.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev pull/1265/head:pull/1265

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