Reapply backport of SNMP support
Merge pull request #2 from ClearwaterCore/fix-snmp

Reapply backport of SNMP support