Couchbase changes for Clocker

Why still commented out?