Merge pull request #5783 from ncopa/cni-node-1.7.1

Merge pull request #5783 from ncopa/cni-node-1.7.1 #832