Fix declaration of ConcurrentHashMap instance (rebased onto develop)



This is the same as gh-1280 but rebased onto develop.

----

This should prevent issues with running 1.8-compiled classes on 1.6 or 1.7.

/cc @jburel