Merge pull request #3142 from agresch/agresch_storm_3523

STORM-3523 prevent supervisor restart freeing slot on FNF exception