Merge "Update SNMP agent config"