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

Conflicts:
	conman.c
	drive.c

devser.c

@@ -308,7 +308,7 @@ DevSer *DevMake(SConnection * con, int argc, char *argv[])
   devser->status = AsconUnconnected;
   devser->startTime = -1;
   TaskRegisterN(pServ->pTasker, AsconHostport(ascon),
-		DevQueueTask, NULL, NULL, devser, 0);
+		DevQueueTask, NULL, NULL, devser, TASK_PRIO_HIGH);
   return devser;
 }