Port TestRemoteConflictResolution

- Ported ReplicationTest.TestRemoteConflictResolution
- Fixed Puller bug that deleted revisions were not deleted from the
local storage.