Backport additional changes from main

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/WaitForReadyStep.java

@@ -316,6 +316,10 @@ int incrementAndGetRecheckCount() {
       return recheckCount.incrementAndGet();
     }
 
+    int getAndIncrementRecheckCount() {
+      return recheckCount.getAndIncrement();
+    }
+
     int getRecheckCount() {
       return recheckCount.get();
     }

operator/src/main/java/oracle/kubernetes/operator/steps/WatchDomainIntrospectorJobReadyStep.java

@@ -4,14 +4,15 @@
 package oracle.kubernetes.operator.steps;
 
 import io.kubernetes.client.openapi.models.V1Job;
-import oracle.kubernetes.operator.DomainStatusUpdater;
 import oracle.kubernetes.operator.JobAwaiterStepFactory;
 import oracle.kubernetes.operator.JobWatcher;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 
+import static oracle.kubernetes.operator.DomainStatusUpdater.createRemoveFailuresStep;
+
 public class WatchDomainIntrospectorJobReadyStep extends Step {
 
   @Override
@@ -20,9 +21,9 @@ public NextAction apply(Packet packet) {
 
     if (hasNotCompleted(domainIntrospectorJob)) {
       JobAwaiterStepFactory jw = packet.getSpi(JobAwaiterStepFactory.class);
-      return doNext(jw.waitForReady(domainIntrospectorJob, getNext()), packet);
+      return doNext(jw.waitForReady(domainIntrospectorJob, createRemoveFailuresStep(getNext())), packet);
     } else {
-      return doNext(DomainStatusUpdater.createRemoveFailuresStep(getNext()), packet);
+      return doNext(createRemoveFailuresStep(getNext()), packet);
     }
   }
 

operator/src/main/java/oracle/kubernetes/operator/work/Packet.java

@@ -24,7 +24,9 @@ public Packet() {
    * @param component a component which knows how to add itself to a packet.
    */
   public Packet with(PacketComponent component) {
-    component.addToPacket(this);
+    if (component != null) {
+      component.addToPacket(this);
+    }
     return this;
   }
 

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainStatus.java

@@ -68,7 +68,7 @@ public class DomainStatus {
   /**
    * The number of introspector job failures since the last success.
    *
-   * @deprecated Introspection permanent failure is now controlled by time rather than failure count
+   * @deprecated Introspection failure is now controlled by a maximum time rather than a failure count
    **/
   @SuppressWarnings("unused")
   @Description(
@@ -331,6 +331,10 @@ public String getReason() {
     return reason;
   }
 
+  private DomainFailureReason getReason(DomainCondition newCondition) {
+    return newCondition.getReason();
+  }
+
   /**
    * A brief CamelCase message indicating details about why the domain is in this state.
    *