More cleanups for Sonar.

- deduplicate SnmpStore and NamedSnmpVar
- clean up synchronization issues
- clean up use of keySet() instead of entrySet()
Merge remote-tracking branch 'origin/master' into features/sonar-cleanup