Merge proposals dependent on lp://qastaging/~pedronis/desktopcouch/trying-with-an-other-couchdb

1. trying-with-an-other-couchdb
2. Dependent merge proposals