TRQ-2552 and TRQ-2503. This fixes a problem when a multi-node
job is cancelled but the sister nodes of the job do not get
the job cleared out in a timely manner. Generally this causes
a problem in preemption when a job gets restarted before the
sister nodes release the job.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev