MB-29287: Merge remote-tracking branch 'couchbase/spock'->vulcan

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

Change-Id: I0d17c565aadfa14132abb183f5605ad42205f4e9

Author: trondn

engines/ep/src/dcp/stream.cc

@@ -272,7 +272,7 @@ ActiveStream::ActiveStream(EventuallyPersistentEngine* e,
       includeXattributes(includeXattrs),
       includeDeleteTime(includeDeleteTime),
       filter(filter, manifest),
-      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 ";