Merge "Fixes to LocalFile::lock()"