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

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

Change-Id: If8b91561e9e1b2561da1b4d53d0f1f3cd646dddd

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 ";