Set srun default task count properly when --ntasks-per-node specified

Similar problem to that described in bug 343 for sbatch
There are many differences in the salloc/srun/sbatch argument
processing that should probably be made more uniform, but no time
to do so now