Merge remote-tracking branch 'origin/candidate-3.10.x' into candidate-4.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

common/fileview2/fvresultset.cpp

@@ -610,9 +610,13 @@ void CResultSetMetaData::getXmlSchema(ISchemaBuilder & builder, bool useXPath) c
             builder.endIfBlock();
             break;
         case FVFFbeginrecord:
+            if (useXPath)
+                fvSplitXPath(meta->queryXPath(idx), xname, name);
             builder.beginRecord(name);
             break;
         case FVFFendrecord:
+            if (useXPath)
+                fvSplitXPath(meta->queryXPath(idx), xname, name);
             builder.endRecord(name);
             break;
         case FVFFdataset: