Merge eccfac8 into backport/b-fix-kill-timeout-validation/widely-aler…

…t-kodiak

nomad/structs/structs.go

@@ -6738,7 +6738,7 @@ func (tg *TaskGroup) Validate(j *Job) error {
 
 		// Validate the group's Update Strategy does not conflict with the Task's kill_timeout for service type jobs
 		if isTypeService && tg.Update != nil {
-			// progress_deadline = 0 has a special meaning show it should not
+			// progress_deadline = 0 has a special meaning so it should not be
 			// validated against the task's kill_timeout.
 			if tg.Update.ProgressDeadline > 0 && task.KillTimeout > tg.Update.ProgressDeadline {
 				mErr.Errors = append(mErr.Errors, fmt.Errorf("Task %s has a kill timout (%s) longer than the group's progress deadline (%s)",