Defer scheduling on batch submit or job complete if SchedulerParameters=defer
Minor test mods for running on IBM PE systems
Clarify srun prolog/epilog options.
Confirm that sh5util command is passed a job option

Bug 351
Disable setting implicit value of a job's cpus_per_task value

This removes logic added three years ago that would automatically set a job's cpus_per_task value in order to reset a job's mem_per_cpu value and scale the cpus_per_task by the same value. Equivalent logic did not exist in the step allocation logic. Just return an error instead. This change will be made in Slurm version 2.6, but this batch is made for version 2.5. The original patch introducing the problem is in commit: cc00cc70b9c90816afc511e0261e449857176332bug 352
Merge branch 'slurm-2.6'