Ticket 49576 - Update ds-replcheck for new conflict entries
    
    Description:  This patch addresses the recvent changes to conflict
                  entries and tombstones.
    
    https://pagure.io/389-ds-base/issue/49576
    
    Reviewed by: tbordaz(Thanks!)
    
    (cherry picked from commit 53e58cdbfb2a2672ac21cd9b6d59f8b345478324)