Fix leaking empty concurrent hashmaps
2343 - extracted cleanup to function
2343 - checkstyle fix
2343 - fix comment
2343 - code review comments from bturner
Merge pull request #2929 from PetroSemeniuk/issues/2343

Fix leaking empty concurrent hashmaps