Partial testSyncSObjectDetectConflictUpdate and bug fixes
Removing unsused test data
Merge pull request #105 from wmathurin/unstable20

Partial testSyncSObjectDetectConflictUpdate and bug fixes