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