fix network interface type identification

WMI type is not reliable enough for our needs.
Merge remote-tracking branch 'origin/2.3.x' into 2.3.x