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

Author: trondn

engines/ep/src/dcp/stream.cc

@@ -269,7 +269,7 @@ ActiveStream::ActiveStream(EventuallyPersistentEngine* e,
       includeValue(includeVal),
       includeXattributes(includeXattrs),
       filter(std::move(filter)),
-      cursorName(n + std::to_string(cursorUID.fetch_add(1))) {
+      cursorName(n + '/' + std::to_string(cursorUID.fetch_add(1))) {
     const char* type = "";
     if (flags_ & DCP_ADD_STREAM_FLAG_TAKEOVER) {
         type = "takeover ";