Merge "c2a: add option to use Cargo.toml.orig"