[CE backport] Clean merge_jid whenever necessary on the merge process

Merged Oswaldo Ferreir requested to merge 38476-improve-merge-jid-cleanup-on-merge-process-ee into master