Unit test regarding conflict resolution behavior 

While debugging https://github.com/couchbase/couchbase-lite-java-core/issues/106 I needed to compare the android vs. ios behavior w.r.t conflict resolution.  I could not find an existing unit test that did what I needed, so I added another one.