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

* V5-6-patches:
  snmpnetstat: search ifName and ifAlias when looking for interface name from -CI option.