[jdk17u-dev] RFR: 8307091: A few client tests intermittently throw ConcurrentModificationException

[Andrew Lu]

I backport this for parity with 17.0.12-oracle.

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

Commit messages:
 - Backport 465bdd9e416cacc6cc7dd91a29cc84adf2eaf1ed

Changes: https://git.openjdk.org/jdk17u-dev/pull/2489/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=2489&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8307091
  Stats: 18 lines in 1 file changed: 8 ins; 2 del; 8 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/2489.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/2489/head:pull/2489

PR: https://git.openjdk.org/jdk17u-dev/pull/2489