CRAY - Fix SLURM_TASKS_PER_NODE to be set correctly.
Accounting - more checks for strings with a possible `'` in it.
Merge remote-tracking branch 'origin/slurm-2.5'