Merge branch 'V5-4-patches' of ssh://git.code.sf.net/p/net-snmp/code into V5-4-patches