feature #2464: retry file deletion in common tm files
Merge branch 'feature-2464'