recovered jobs continue discarding output

This fixes the case where a job was started and told to discard output,
and then Warden is drained and recovers from snapshots. Previously it
would start tracking output again, which could lead to 'output exceeded'
errors.
Auto-merge remote-tracking branch 'upstream/master'