couchdb: update_user_webapp fails

 Output of error log below:

   - [rewdevcouch1] err: /Stage[main]/Site_couchdb/Couchdb::Add_user[webapp]/Couchdb::Update[update_user_webapp]/Exec[couch-doc-update --port 5986 --db _users --id org.couchdb.user:webapp --data '{"type": "user", "name": "webapp", "roles": ["auth"], "password_sha": "2e322d7fb2026b3746f0dee4b1a82a4c29b42d21", "salt": "f9c0da575b2f45dd97888a5b649973f1"}']/returns: change from notrun to 0 failed: couch-doc-update --port 5986 --db _users --id org.couchdb.user:webapp --data '{"type": "user", "name": "webapp", "roles": ["auth"], "password_sha": "2e322d7fb2026b3746f0dee4b1a82a4c29b42d21", "salt": "f9c0da575b2f45dd97888a5b649973f1"}' returned 2 instead of one of [0] at /srv/leap/puppet/modules/couchdb/manifests/update.pp:6 

-------------------------------------------------------------------

error log: /var/log/leap/rewire/develop/deploy-rewdevcouch1-2013-08-29-180133-error.log
comlete log: /var/log/leap/rewire/develop/deploy-rewdevcouch1-2013-08-29-180133.log

Tested on Do 29. Aug 18:05:26 UTC 2013 on "rewdevcouch1" with following versions/git commit IDs: 

Provider (/home/testbot/platform-test/rewire/develop/rewire): not under version control

 = leap command v1.2.1 (master 1c889bd37b147527b7ad140bf8f310da7d196537)
commit 1c889bd37b147527b7ad140bf8f310da7d196537
Author: elijah 
Date:   Fri Aug 16 01:38:54 2013 -0700

    only install compatible sahara vagrant plugin version


 = leap platform v0.2.3 (develop 7ec54bd92bc63e1d7a5213196c1b4fb1bbe1b0b4)
commit 7ec54bd92bc63e1d7a5213196c1b4fb1bbe1b0b4
Author: varac 
Date:   Thu Aug 29 19:42:56 2013 +0200

    updated submodule couchdb, fixed merge resolution error from last merge

(from redmine: created on 2013-08-29, closed on 2013-08-30)