Merge "phpunit: Make LogFormatterTest less slow"