Merge "Correct whitespace and parentheses typos in BlockLogFormatter"