[jdk11u-dev] RFR: 8223142: Clean-up WS and CB.

[Goetz Lindenmaier]

I backport this for parity with 11.0.15-oracle.

Several hunks did not apply.

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

Commit messages:
 - Backport 7bb9062f84506cdeb2d4435ccf92ea5c89b6a453

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/745/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=745&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8223142
  Stats: 225 lines in 1 file changed: 31 ins; 6 del; 188 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/745.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/745/head:pull/745

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