Merge "filerepo: Add missing quote back to LocalFileLockError message"