RelNoteson commit merge-recursive: Fix D/F conflicts (3734893)
   1Documentation/RelNotes-1.7.1.txt