merge SLURM adaptor in CommonAdaptor (crudely, since I have no way to test SLURM). Make minor mods of CommonAdaptor