[squash] etap test updates
[squash] to the couch_drv change
[squash] to etap test update
[squash] to etap udpate