Support conflicts with include_docs in _changes
Support conflicts with include_docs in _changes

BugzID: 12725

fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb,fkaempfer/couchdb