Merge "logging tests - retry for failed calls to log checker"