Some conflicts were not being added in the getAllDocs() query.  now testConflict() test completely passes.
Some conflicts were not being added in the getAllDocs() query.  now testConflict() test completely passes.

 (other tests in suite are failing however due to previous changes)

gotmyjobs/couchbase-lite-java-core,4u7/couchbase-lite-java-core,netsense-sas/couchbase-lite-java-core,Spotme/couchbase-lite-java-core,mariosotil/couchbase-lite-java-core,mariosotil/couchbase-lite-java-core,couchbase/couchbase-lite-java-core,mariosotil/couchbase-lite-java-core,deleet/couchbase-lite-java-core