Merge "Restore existing committer info correctly when a new commit fails." into rvc-dev