Modify POE test due to signal handling differences from native slurm
POE - Correct task count for srun --launch-cmd option

This only changes behaviour when the --ntasks option is not used,
but the --cpus-per-task option is use
POE - Fix logic binding tasks to CPUs.

Without this change pmdv12 was bound to one CPU and could not use
all of the resources allocated to the job step for the tasks that
it launches
Merge branch 'slurm-2.5'