CRAY - Remove else if to make the NHC run after every step even if the
job is completing.
Merge remote-tracking branch 'upstream/master'