Merge "[FileBackend] File locking fixes."