MB-29287: Merge remote-tracking branch 'couchbase/watson_ep'->couchbase/5.1.0
MB-29287: Merge remote-tracking branch 'couchbase/watson_ep'->couchbase/5.1.0

* couchbase/watson_ep:
  MB-29287: Avoid ambiguity in ActiveStream cursor name

Change-Id: Ibe84ac08bde0f463de1b536386c9c5958b16a78a

daverigby/kv_engine,daverigby/kv_engine,daverigby/kv_engine,daverigby/kv_engine