Merge branch 'candidate-5.6.8' into candidate-6.0.6

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

initfiles/bash/etc/init.d/hpcc_common.in

@@ -412,9 +412,6 @@ startCmd() {
     printf "Starting %-21s" "$compName ..."
     log "compType = $compType"
 
-    # use less heap when threaded
-    export MALLOC_ARENA_MAX=8
-
     # Creating logfiles for component
     logDir=$log/${compName}
 

initfiles/sbin/hpcc_setenv.in

@@ -80,6 +80,9 @@ source /etc/profile
 IFS="${OIFS}"
 umask ${OUMASK}
 
+# use less heap when threaded
+export MALLOC_ARENA_MAX=8
+
 PATH_PREFIX=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^path *= *" | sed -e 's/^path *= *//'`
 
 export PID=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^pid *= *" | sed -e 's/^pid *= *//'`