update to concurrentlinkedhashmap 1.3.1
Merge branch '2.1.x'