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

Conflicts:
	conman.c
	drive.c

remob.c

@@ -978,7 +978,7 @@ static RemServer *RemServerInit(char *name, char *host, int port)
   remserver->interestActive = 0;
   remserver->forwardMessages = 1;
   TaskRegisterN(pServ->pTasker,name, RemServerTask, NULL, RemServerKill,
-               remserver, 1);
+               remserver, TASK_PRIO_HIGH);
   return remserver;
 }