Merge "Tighten ERROR regexp in log checker"