Merge branch 'candidate-5.0.6' into candidate-5.2.0

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

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

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

@@ -408,7 +408,7 @@ start_dafilesrv() {
       return $?
    else
       printf "Starting %-21s" "$compName.... "
-      log_failure_msg "Already started"
+      log_success_msg "Already started"
       return 0
    fi
 }
@@ -429,17 +429,17 @@ startCmd() {
        RCSTART=$?
        if [ ${RCSTART} -ne 0 ];then
           if [ ${DEBUG} != "NO_DEBUG" ]; then
-              log_failure_msg "Pid or lock file exists, but process is not running"
+              log_failure_msg "fixing orphan :: check_status code is ${RCSTART}"              log_failure_msg "Pid or lock file exists, but process is not running"
           fi
           cleanup_component
           removePid ${PIDPATH}
           unlock ${LOCKPATH}
        else
           if [ ${DEBUG} != "NO_DEBUG" ]; then
-              log_failure_msg "Lock or Pid file already exists"
+              log_success_msg "Lock or Pid file already exists"
           else
               #Since component is already started but current script is failed till returning 0
-              log_failure_msg "Already Started"
+              log_success_msg "Already started"
           fi
           return ${RCSTART}
        fi
@@ -525,9 +525,9 @@ stop_component() {
     RCSTOP=$?
     if [ $RCSTOP -ne 0 ];then
        if [ ${DEBUG} != "NO_DEBUG" ]; then
-          log_failure_msg "Failed: Process is not running"
+          log_success_msg "Process already stopped :: check_status code is ${RCSTOP}"
        else
-          log_failure_msg "Already Stopped"
+          log_success_msg "Already stopped"
        fi
        cleanup_component
        removePid ${PIDPATH}