Merge "Allow retry of test if log missing."