Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  Fix bug 2546: netsnmp_tdomain_transport_full uses wrong port for snmptrap + udp6