Merge branch 'develop' into 5.4.0

remote/exe/rs_remotehandler/src/rs_remotehandler.c

@@ -194,7 +194,7 @@ static void AddTransports()
   {
     sts = gdh_ObjidToPointer(objid, &objref);
     sprintf(tp[tpcount].path, "rs_remote_qcom"); 
-    tp[tpcount].id = ((pwr_sClass_RemnodeQCom *) objref)->MyQueue;
+    tp[tpcount].id = ((pwr_sClass_RemnodeQCom *) objref)->ReceiveQueue;
     tp[tpcount].disable = &((pwr_sClass_RemnodeQCom *) objref)->Disable;
     tp[tpcount].restart_limit = &((pwr_sClass_RemnodeQCom *) objref)->RestartLimit;
     tp[tpcount].restarts = &((pwr_sClass_RemnodeQCom *) objref)->RestartCount;

src/lib/co/src/co_ccm.c

@@ -611,7 +611,7 @@ int ccm_varname_parse(
 	    }
 	    sscanf( elementstr, "%d", element);
 	    *s = '\0';
-	    if ( (*element < 0) || (*element > 1000) )
+	    if ( (*element < 0) || (*element > 5000) )
 	    {
 	      return 0;
 	    }

wb/lib/wb/src/wb_lfu.cpp

@@ -2371,7 +2371,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 			 nodename_ptr, nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_ApplFile)
 		fprintf( file, "appl %s W "pwr_cNameAppl" $pwrp_load/\n",
-			 nodename_ptr, "$pwrp_cnf/", nodename_ptr, *bus_number_ptr);
+			 nodename_ptr, "$pwrp_load/", nodename_ptr, *bus_number_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_PwrpAliasFile)
 		fprintf( file, "appl %s W $pwrp_load/pwrp_alias.dat $pwrp_load/pwrp_alias.dat\n", 
 			 nodename_ptr);
@@ -2382,7 +2382,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	      if ( *components_ptr & pwr_mDistrComponentMask_XMLFiles)
 		fprintf( file, "appl %s W $pwrp_load/*.xml\n", nodename_ptr);
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttHelpFile) {
-		fprintf( file, "appl %s W $pwrp_cnf/%s/xtt_help.dat:$pwrp_cnf/xtt_help.dat $pwrp_load/xtt_help.dat\n", 
+		fprintf( file, "appl %s W $pwrp_load/%s/xtt_help.dat:$pwrp_load/xtt_help.dat $pwrp_load/xtt_help.dat\n", 
 			 nodename_ptr, nodename_ptr);
 	      }
 	      if ( *components_ptr & pwr_mDistrComponentMask_XttResourceFile) {