Merge "Fix cniVersion for non-genie deployments."