(#2072) Additional tests of conflict resolution

Test various combinations of revisions, eliciting an error in leveldb bulkDocs.