Merge pull request #3556 from dcbw/sdn-preserve-var-lib-cni

node/sdn: make /var/lib/cni persistent to ensure IPAM allocations stick around across node restart