Merge "Use ManualLogEntry instead of LogPage to add a new log entry of old file versi...