Fix for srun command to log job timeout

This reverts most of commit
https://github.com/SchedMD/slurm/commit/570941362ffdc57e9e3d4723bc4f728ae04789d8
and adds a call from slurmctld to srun prior to deallocating nodes and
notifying slurmd to cancel the tasks