Fix test on 0.10: conflicts only when other branch is different.
Fix test on 0.10: conflicts only when other branch is different.

gcarranza/couchdb-python,ssaavedra/couchdb-python,oliora/couchdb-python,erikdejonge/rabshakeh-couchdb-python-progress-attachments,jur9526/couchdb-python,hdmessaging/couchbase-mapping-python