Merge pull request #2844 from elfiesmelfie/fix_snmp_agent