[Yum-devel] Support meld merge and deletion of old config file

[rocketraman at fastmail.fm]

Re-rolled patchset as per list discussion. Patches #1 and #3 from
the original patchset are included, with the order for the new meld
option having final_file on the right.