Merge branch '3040-skip-os-daemon-tests' of https://github.com/wohali/couchdb-couch