Merge "Parse two date formats in monkey log parser"