33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
Maybe this used to be true with the old attachment manager code, but you can now easily do
``
mutableRevision.body = @{@"foo2.a":@"bar2.a"};
``
in your if(attach) block