33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
Wouldn't it be better to leave them so when the deprecated API is removed, we can just delete test files that use the old API?