resolve conflict in slurm_fixes

buildCert.yml

buildKaraage3.x.yml

extra_packages/tasks/main.yml

installNFS.yml

...nashBioinformaticsPlatform_node_allocation/tasks/main.yml

roles/OpenVPN-Client/handlers/main.yml

roles/OpenVPN-Client/tasks/installOpenVPN.yml

roles/OpenVPN-Client/tasks/main.yml

roles/OpenVPN-Server/handlers/main.yml

roles/OpenVPN-Server/tasks/installOpenVPN.yml

roles/OpenVPN-Server/tasks/main.yml

roles/apache2/tasks/apacheDebian.yml

roles/apache2/tasks/apacheRedHat.yml

roles/apache2/tasks/main.yml

roles/apt-get-update/tasks/main.yml

roles/calculateExports/tasks/main.yml

roles/calculateKnownHosts/tasks/main.yml

roles/calculateNhcConfig/tasks/main.yml

roles/calculateSlurmConf/tasks/main.yml

roles/centos7Base/tasks/installBasePackages.yml