Tolerate both old and new java.util.concurrent.ConcurrentHashMap
Tolerate both old and new java.util.concurrent.ConcurrentHashMap

Change-Id: I87397bbb662d7dd8cb0683fc08bd35b401034357

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst