Merge branch 'develop' of ssh://gitlab.psi.ch/sinqdev/sics into develop

SICSmain.c

@@ -22,7 +22,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include "nserver.h"
-#include "servlog.h"
+#include "logv2.h"
+
 
 extern void KeepStartupCommands(); /* ofac.c */
 
@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
   for (i = firstArg; i < argc; i++) {
     if (argv[i][0] == '-') {
       if (strcasecmp(argv[i], "-nolog") == 0) {
-        SICSLogEnable(0);
+        DisableLog();
       }else if(strcmp(argv[i],"-keepstartup") == 0){
         KeepStartupCommands();
 #ifdef SITE_ANSTO