Merge "[FileRepo] Locking and transaction fixes."