fix for merlin6 login nodes
The script was still setup for using compute nodes when using merlin 6, and the login node only worked for merlin 5
I removed the merlin5 options, and made the merlin6 options work from login nodes
Edited by albajacas_a