Merge remote-tracking branch 'origin/candidate-3.8.x' into candidate-3.8.6

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

initfiles/sbin/hpcc_setenv.in

@@ -47,6 +47,11 @@ HPCC_CONFIG=${HPCC_CONFIG:-${CONFIG_DIR}/${ENV_CONF_FILE}}
 #SECTION=${1:-DEFAULT}
 SECTION="DEFAULT"
 
+OIFS="${IFS}"
+unset IFS
+source /etc/profile
+IFS="${OIFS}"
+
 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 *= *//'`
@@ -157,5 +162,3 @@ else
         fi
     fi
 fi
-
-source /etc/profile