Merge pull request #2208 from remakeelectric/snmp-agentx