fix sofabed test to not be dependent on prior tests
Merge pull request #4011 from dimagi/sofabed-testfix

fix sofabed test to not be dependent on prior tests
update staging.yaml

[ci skip]
update staging.yaml

[ci skip]
make travis use stock couch and fix auth
Merge pull request #3975 from dimagi/travis-couchdb

Fix couchdb on travis build
Merge branch 'master' into subtree-merge-forms-cases