Allow resubmit and kill in KILLFAILED state
Merge remote-tracking branch 'upstream/master'