Merge pull request #1732 from smeda/issue1731

Fixes #1731 Set Thor slaves attribute to number of slaves times slavesPerNode

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>

deployment/deployutils/configenvhelper.cpp

@@ -1253,7 +1253,8 @@ void CConfigEnvHelper::UpdateThorAttributes(IPropertyTree* pParentNode)
     setAttribute(pParentNode, "@localThor", localThor ? "true" : "false");
 
     StringBuffer sb;
-    sb.appendf("%d", nSlaves);
+    int slavesPerNode = pParentNode->getPropInt("@slavesPerNode", 1);
+    sb.appendf("%d", nSlaves * slavesPerNode);
     setAttribute(pParentNode, XML_ATTR_SLAVES, sb.str());
 }