[svn r46010] Merge from branch - a lock for files, prevents segfaults of cpython
[svn r46010] Merge from branch - a lock for files, prevents segfaults of cpython

--HG--
branch : trunk

icemac/pytest,hunse/pytest,MichaelAquilina/pytest,ojake/pytest,markshao/pytest,alfredodeza/pytest,ionelmc/pytest,wfxiang08/pytest,omarkohl/pytest,bubenkoff/pytest,pytest-dev/py,takluyver/pytest,Carreau/pytest,doordash/pytest,rouge8/pytest,gabrielcnr/pytest,Magicjarvis/py,pfctdayelise/pytest,bukzor/pytest,tomviner/pytest,nicoddemus/repo-test,ericdill/pytest,tomviner/pytest,ojake/pytest,hpk42/pytest,oleg-alexandrov/pytest,ghostsquad/pytest,hackebrot/pytest,inirudebwoy/pytest,txomon/pytest,mbirtwell/pytest,omarkohl/pytest,mbirtwell/pytest,codewarrior0/pytest,skylarjhdownes/pytest,bubenkoff/pytest,inirudebwoy/pytest,takluyver/pytest,pytest-dev/pytest,nicoddemus/repo-test,flub/pytest,chillbear/pytest,tgoodlet/pytest,mdboom/pytest,tareqalayan/pytest,RonnyPfannschmidt/pytest,gabrielcnr/pytest,abusalimov/pytest,ropez/pytest,malinoff/pytest,untitaker/pytest,pelme/pytest,userzimmermann/pytest,jb098/pytest,mdboom/pytest,mhils/pytest,Bjwebb/pytest,ddboline/pytest,vodik/pytest,ionelmc/pytest,mhils/pytest,chillbear/pytest,doordash/pytest,untitaker/pytest,rouge8/pytest,ghostsquad/pytest,eli-b/pytest,rmfitzpatrick/pytest,davidszotten/pytest,pelme/pytest,nicoddemus/pytest,Haibo-Wang-ORG/pytest,Akasurde/pytest,bukzor/pytest,lukas-bednar/pytest,jb098/pytest,JonathonSonesen/pytest,vmalloc/dessert,Haibo-Wang-ORG/pytest,abusalimov/pytest,oleg-alexandrov/pytest,Bachmann1234/pytest,chiller/pytest,jaraco/pytest,Carreau/pytest,chiller/pytest,nicoddemus/pytest,userzimmermann/pytest,The-Compiler/pytest,hpk42/pytest,MengJueM/pytest,The-Compiler/pytest,etataurov/pytest,Bjwebb/pytest,codewarrior0/pytest,MengJueM/pytest,Bachmann1234/pytest,icemac/pytest,ericdill/pytest,wfxiang08/pytest,lukas-bednar/pytest,JonathonSonesen/pytest,vodik/pytest,hunse/pytest,ropez/pytest