Merge "Allow failing logs with errors on a per-log-file basis"