Avoid deadlocks and heavy CPU usage (#3552)

* Avoid deadlocks and heavy CPU usage
 - use read/write locks instead of synchronized
 - use Thread.sleep to avoid aggressive loop
 - use ArrayBlockingQueue instead of LinkedBlockingQueue (minor)
 - use fairness to respect FIFO thread access to the queue.
 - apply reviews
 - trying to fix failing test