HPCC-9535 Rationalize Roxie topology info

Minor changes following code review.

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

dali/base/dadfs.cpp

@@ -7766,9 +7766,8 @@ class CInitGroups
                 // MORE - it's not clear whether this is correct for full redundancy and overloaded clusters
                 {
                     unsigned k;
-                    for (k=0;k<eps.ordinality();k++)
-                        if (eps.item(k).equals(ep))
-                            break;
+                    if (eps.contains(ep))
+                        break;
                     if (k==eps.ordinality())
                         eps.append(ep); // just add (don't care about order and no duplicates)
                     break;

deployment/configgen/main.cpp

@@ -520,8 +520,6 @@ int processRequest(const char* in_cfgname, const char* out_dirname, const char*
       {
         if (!strcmp(pComponent->queryProp("@buildSet"), "roxie") || !strcmp(pComponent->queryProp("@buildSet"), "thor"))
         {
-          StringBuffer sbChildren;
-          bool isMaster = false;
           Owned<IPropertyTreeIterator> itInst = pComponent->getElements("*");
           ForEach(*itInst)
           {
@@ -529,13 +527,9 @@ int processRequest(const char* in_cfgname, const char* out_dirname, const char*
             String instName(pInst->queryName());
             if (!strcmp(instName.toCharArray(), "ThorMasterProcess") || instName.startsWith("RoxieServerProcess"))
             {
-              isMaster = true;
               out.appendf("%s=%s;%s%c%s;%s\n", pComponent->queryProp("@name"), pComponent->queryProp("@buildSet"), out_dirname, PATHSEPCHAR, pComponent->queryProp("@name"),"master");
             }
           }
-
-          if (!isMaster)
-            out.append(sbChildren);
         }
         else
           out.appendf("%s=%s;%s%c%s\n", pComponent->queryProp("@name"), pComponent->queryProp("@buildSet"), out_dirname, PATHSEPCHAR, pComponent->queryProp("@name"));