fix conflict, exactly the same changes were upstream

...nashBioinformaticsPlatform_node_allocation/tasks/main.yml

roles/jasons_ssh_ca/files/server_ca.pub

roles/jasons_ssh_ca/handlers/main.yml

roles/jasons_ssh_ca/tasks/main.yml

roles/modulefiles/tasks/main.yml

roles/provision/tasks/main.yml

roles/provision/templates/provision.sh.j2

roles/provision/vars/main.yml

roles/slurm-from-source/tasks/installCgroup.yml

roles/slurm-from-source/tasks/installNhc.yml

roles/slurm-from-source/tasks/main.yml

roles/strudel_config/templates/generic_slurm_config.json.j2