fixing variables
Merge branch 'couchbase' into hostbase

* couchbase:
  fixing variables