9863881
macros.cargo: vacuum up Cargo.toml.orig in addition to Cargo.lock This fixes builds with cargo from Rust 1.62+, which now complains and fails our builds if the Cargo.toml.orig file already exists.