Fixed multi level parallel wait for jobs when failures
Cleanup of failure handling