Merge pull request #6626 from oskarirauta/luci-cni-protocol