TRUNK-4230 SonarQube - Inefficient use of keySet iterator instead of entrySet iterator
Merge pull request #560 from kkaczmarczyk/TRUNK-4230

TRUNK-4230 SonarQube - Inefficient use of keySet iterator instead of entrySet iterator