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

[Martin Doerr]

Clean backport of [JDK-8323670](https://bugs.openjdk.org/browse/JDK-8323670).

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

Commit messages:
 - Backport 70e7cdcb9ecedd455cf701b5c7ad05286ac0067d

Changes: https://git.openjdk.org/jdk17u-dev/pull/2552/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=2552&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8323670
  Stats: 48 lines in 1 file changed: 6 ins; 4 del; 38 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/2552.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/2552/head:pull/2552

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