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

* V5-6-patches:
  adjust debug token for netsnmp_sockaddr_in6_2