removing JSR-166e ConcurrentHashMap

Basically reverting  #6400 as requested by @mikemccand