Handle correctly files removal timeout.
Merge pull request #4226 from HassenRiahi/HandleCorrecltDelTimeout

Handle correctly files removal timeout.