[jdk11u-dev] RFR: 8256152: tests fail because of ambiguous method resolution

[Goetz Lindenmaier]

I downport this for parity with 11.0.14-oracle.

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

Commit messages:
 - Backport 646c20022c73258bebf7c55b3e1992b62f5de042

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/452/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=452&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8256152
  Stats: 1 line in 1 file changed: 0 ins; 0 del; 1 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/452.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/452/head:pull/452

PR: https://git.openjdk.java.net/jdk11u-dev/pull/452