Merge branch 'candidate-5.4.8' into candidate-5.6.0

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

dali/base/dautils.cpp

@@ -1103,8 +1103,7 @@ bool CDfsLogicalFileName::setFromMask(const char *fname,const char *rootdir)
                             if (memicmp(fname,"_of_",4)==0) {
                                 if (!fname[4])
                                     return false;
-                                set(logicalName.str());
-                                return true;
+                                return setValidate(logicalName.str());
                             }
                         }
                     }

docs/ECLLanguageReference/ECLR_mods/BltInFunc-DISTRIBUTE.xml

@@ -156,7 +156,7 @@
     the existing distribution of the specified <emphasis>index</emphasis>,
     where the linkage between the two is determined by the
     <emphasis>joincondition</emphasis>. Records for which the
-    <emphasis>joncondition</emphasis> is true will end up on the same
+    <emphasis>joincondition</emphasis> is true will end up on the same
     node.</para>
   </sect2>
 

docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml

@@ -209,10 +209,6 @@
     </sect1>
   </chapter>
 
-  <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml"
-              xpointer="Hardware-and-Software-Chapter"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
   <chapter id="HPCC-installation-and-startup">
     <title>HPCC Installation and Startup</title>
 

ecl/hql/hqlgram2.cpp

@@ -2861,8 +2861,14 @@ void HqlGram::releaseScopes()
 
     leftRightScopes.kill();
     
-    while (selfScopes.length()>0)
+    while (selfScopes.length() > 0)
+    {
+        //Ensure that we do not remove any scopes that are still active - otherwise they will be released too early
+        OwnedHqlExpr self = getSelfScope();
+        if (activeRecords.contains(*self))
+            break;
         popSelfScope();
+    }
     modScope.clear();
     outerScopeAccessDepth = 0;
 

initfiles/componentfiles/configxml/buildsetCC.xml.in

@@ -189,6 +189,10 @@
                           path="EclDirectAccess"
                           resource="EclDirectAccess"
                           service="ecldirect"/>
+    <AuthenticateFeature description="Access to ESDL configuration service"
+                          path="ESDLConfigAccess"
+                          resource="ESDLConfigAccess"
+                          service="ws_esdlconfig"/>
      <ProcessFilters>
       <Platform name="Windows">
        <ProcessFilter name="any">