Revert "Fix compilation error in CouchKVStore"
Revert "Fix compilation error in CouchKVStore"

This reverts commit 3ec7d2f08243d004a182884b1ec81c6b95c21dd9.

This changeset don't fix all of the build problems introduced in
the previous patch.. Need to back it out in order to back out the
other.

Change-Id: I07866e00151e6899fa6dc371ebf380e92e051928
Reviewed-on: http://review.couchbase.org/14019
Reviewed-by: Trond Norbye <60edd2ef23891a753f231b0c6f161dc634079a93@gmail.com>
Tested-by: Trond Norbye <60edd2ef23891a753f231b0c6f161dc634079a93@gmail.com>

daverigby/kv_engine,abhinavdangeti/ep-engine,couchbase/ep-engine,membase/ep-engine,abhinavdangeti/ep-engine,teligent-ru/ep-engine,sriganes/ep-engine,couchbase/ep-engine,hisundar/ep-engine,daverigby/kv_engine,teligent-ru/ep-engine,teligent-ru/ep-engine,daverigby/ep-engine,daverigby/kv_engine,jimwwalker/ep-engine,daverigby/ep-engine,owendCB/ep-engine,couchbase/ep-engine,teligent-ru/ep-engine,jimwwalker/ep-engine,abhinavdangeti/ep-engine,membase/ep-engine,hisundar/ep-engine,hisundar/ep-engine,abhinavdangeti/ep-engine,membase/ep-engine,hisundar/ep-engine,daverigby/ep-engine,owendCB/ep-engine,sriganes/ep-engine,daverigby/ep-engine,owendCB/ep-engine,daverigby/kv_engine,couchbase/ep-engine,owendCB/ep-engine,abhinavdangeti/ep-engine,sriganes/ep-engine,membase/ep-engine,sriganes/ep-engine,jimwwalker/ep-engine,jimwwalker/ep-engine