Merge pull request #10238 from dcamper/hpcc-18002-couchbase-upmerge-correction

HPCC-18002: Couchbase Plugin: Solve upmerge issue

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

plugins/couchbase/couchbaseembed.cpp

@@ -935,7 +935,7 @@ namespace couchbaseembed
 
             constructNewXPath(newXPath, xpath);
 
-            m_oNestedField.set(m_oResultRow->queryBranch(field->name->queryStr()));
+            newPathNode.childCount = m_oResultRow->getCount(newXPath);
             m_pathStack.push_back(newPathNode);
         }
         else