CountDownLatch cleanup
Merge pull request #1636 from pveentjer/cleanup/countdownlatch

CountDownLatch cleanup