Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed"