Prevent a job's end_time from being too small after a basil resveration error.

Bug 1255
Correct macro name.
Fix sbatch --ntasks-per-core option from setting invalid SLURM_NTASKS_PER_CORE environment value.

Bug 1253
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11