Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop

Conflicts:
	conman.c
	drive.c

stack_trace.c

@@ -212,7 +212,7 @@ size_t get_size_of_files(char *glob) {
     DeleteDynString(s);
     close(pipefd[0]);
     waitpid(child_pid, NULL, 0);
-    SICSLogPrintf(eLog, "Total size of files \"%s\" is %ldK", glob, total_size);
+    SICSLogPrintf(eLog, "Total size of files \"%s\" is %ldK", glob, (long int)total_size);
     return total_size;
   }
 }
@@ -319,4 +319,5 @@ int Ansto_Stack_Trace(SConnection *pCon, SicsInterp * pSics, void *pData, int ar
   else
     mode = 1;
   stack_trace(mode);
+  return 1;
 }