merge slurm/supervisor setup files with upstream