Save merge commit id only if fast-forward MRs are disabled.

16 jobs for revert_changes_ee