CBSE-1341 Add couchdb branch for hotfix

Change-Id: If7dc7ba3c550d48b00ccaea935d05f5818be6f9d
Reviewed-on: http://review.couchbase.org/40681
Reviewed-by: Sriram Melkote <siri@couchbase.com>
Tested-by: Chris Hillery <ceej@couchbase.com>