So, for what it's worth, here is my updated fix for #25898, the NFS file locking issue. I cleaned it up some more and included a fix that prevents #26232. I also included that case in the unit test...