r3246 push last SNMP changes into trunk