Issue #358 - use simplified code developed in previous commit in mockSinglePull test.

https://github.com/couchbase/couchbase-lite-android/issues/358
Issue #358 - rework testRemoteConflictResolution to be a mock.

https://github.com/couchbase/couchbase-lite-android/issues/358