Merge "Rename _console-output.log to console.log"