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

Closed Rubén Dávila requested to merge revert_changes_ee into 8-5-stable-ee