Merged re-re-factor-server into inmem-per-run-db-per-run-server. There are conflicts in docs/megatest-training.odp and the pdf that need to be manually merged