Try and fix periodic failures deleting files
Merge remote-tracking branch 'origin/master' into ENG-4881-continued