33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
add a comment that error will have been set by streamAttachmentToBlobStore (it's not entirely clear and I only realised it when I thought about it)