Merge "Make bugreport parser handle both MAIN LOG and SYSTEM LOG syntax."