Merge "Make revision deletion acquire file locks to avoid races"