DDF-457: Changed thread safety of collections from synchronized maps to concurrentHashMaps