Partial testSyncSObjectDetectConflictUpdate and bug fixes