Merge branch 'ff/snmp' into collectd-4.10