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

Reapply backport of SNMP support