33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
You should delete all of the tests which are simply duplicates of the tests in DatastoreConflicts.m - they just increase line count and number of tests without contributing anything new.