Fixing job edit feature when clicking on the span. Fixing concurrency issue where quickly failing jobs may be stuck.
Merge branch 'release-2.1'