Merge "[FileRepo] Changed LocalFile locking to avoid breaking transactions."