RelNoteson commit Support a merge with conflicting gitlink change (ff72af0)
   1Documentation/RelNotes-1.5.4.txt