switch default SNMP timeout to 5s
better changes description
Merge remote-tracking branch 'forge/2.3.x' into 2.3.x