os: networkInterfaces include scopeid for ipv6
Merge remote-tracking branch 'upstream/master'