[JENKINS-32820] Fix the last merge issues

core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java

@@ -40,7 +40,7 @@ public class SolarisSMFLifecycle extends Lifecycle {
      */
     @Override
     public void restart() throws IOException, InterruptedException {
-        Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
+        Jenkins jenkins = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
         try {
             if (jenkins != null) {
                 jenkins.cleanUp();

core/src/main/java/hudson/lifecycle/UnixLifecycle.java

@@ -67,7 +67,7 @@ public class UnixLifecycle extends Lifecycle {
 
     @Override
     public void restart() throws IOException, InterruptedException {
-        Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
+        Jenkins jenkins = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
         try {
             if (jenkins != null) {
                 jenkins.cleanUp();

core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java

@@ -117,7 +117,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
 
     @Override
     public void restart() throws IOException, InterruptedException {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.getInstanceOrNull();
         try {
             if (jenkins != null) {
                 jenkins.cleanUp();