MergeMaster

On a related note, some work on this is already in progress on the dpkg team's proposal page:["Teams/Dpkg/Proposals/ConffileDatabase"]