net-snmp: more upstream fixes
Merge pull request #569 from pyhalov/net-snmp

net-snmp: more upstream fixes