Index: docs/manual/server.png
==================================================================
--- docs/manual/server.png
+++ docs/manual/server.png
cannot compute difference between binary files

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -495,11 +495,11 @@
       (begin
 	(set! *configinfo* (or (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs
 				   (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/"
 							    (get-environment-variable "MT_TARGET")   "/"
 							    (get-environment-variable "MT_RUNNAME")  "/"
-							    ".megatest.cfg")))
+							    ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 				     (if (file-exists? alistconfig)
 					 (list (configf:read-alist alistconfig)
 					       (get-environment-variable "MT_RUN_AREA_HOME"))
 					 #f))
 				   #f) ;; no config cached - give up
@@ -574,11 +574,11 @@
 		  (create-directory fulldir #t)) ;; need to protect with exception handler 
 	      (if (and target
 		       runname
 		       (file-exists? fulldir))
 		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
-			(targfile (conc fulldir "/.megatest.cfg")))
+			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 		    (debug:print-info 0 "Caching megatest.config in " fulldir "/.megatest.cfg")
 		    (configf:write-alist *configdat* tmpfile)
 		    (system (conc "ln -sf " tmpfile " " targfile))
 		    )))))))
 

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -232,14 +232,15 @@
 #  <target>/<runname>/<test>/
 disk0 /tmp/#{getenv USER}/adisk1
 
 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time)
 [jobtools]
-# launcher #{ scheme (case (string->symbol (conc (getenv "datapath"))) \
-#                         ((none) "nbfake") \
-#                         ((openlava) "bsub") \
-#                         (else "sleeprunner"))}
+launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \
+                         ((none) "nbfake") \
+                         ((openlava) "bsub") \
+                         ((sleeprunner) "sleeprunner")
+                         (else "nbfake"))}
 
 # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
 
 # launcher #{shell if which bsub > /dev/null;then echo bsub -q priority -o openlava.log;else echo sleeprunner;fi}
 launcher nbfake
@@ -285,11 +286,11 @@
 [jobtools]
 flexi-launcher yes
 
 [host-types]
 general nbfake
-remote  bsub
+remote  #{get jobtools launcher}
 # remote  nbfake
 
 [launchers]
 runfirst/sum% remote
-% general
+%             general