more effective Map iteration, a trivial fix based on Findbugs finding
better consistency in usage of generics
Merge pull request #1318 from jerrinot/entrySetOpto

more effective Map iteration, a trivial fix based on Findbugs finding