SLURM: looks like we're spelling it CANCELLED now on Stampede.
Merge branch 'master' into devel