rebase fixes

Author: sureshanaparti

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java

@@ -487,7 +487,7 @@ public void updateOperationFailed(VMSnapshot vmSnapshot) throws NoTransitionExce
         try {
             vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed);
         } catch (NoTransitionException e) {
-            s_logger.debug("Failed to change vm snapshot state with event OperationFailed");
+            logger.debug("Failed to change vm snapshot state with event OperationFailed");
             throw e;
         }
     }

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java

@@ -484,7 +484,7 @@ public void updateOperationFailed(VMSnapshot vmSnapshot) throws NoTransitionExce
         try {
             vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed);
         } catch (NoTransitionException e) {
-            LOGGER.debug("Failed to change vm snapshot state with event OperationFailed");
+            logger.debug("Failed to change vm snapshot state with event OperationFailed");
             throw e;
         }
     }

framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java

@@ -1222,7 +1222,7 @@ private boolean cleanupNetwork(final long networkId) {
     private boolean cleanupSnapshot(final long snapshotId) {
         SnapshotVO snapshotVO = _snapshotDao.findById(snapshotId);
         if (snapshotVO == null) {
-            s_logger.warn("Snapshot not found. Skip Cleanup. SnapshotId: " + snapshotId);
+            logger.warn("Snapshot not found. Skip Cleanup. SnapshotId: " + snapshotId);
             return true;
         }
         if (Snapshot.State.Allocated.equals(snapshotVO.getState())) {
@@ -1242,7 +1242,7 @@ private boolean cleanupSnapshot(final long snapshotId) {
     private boolean cleanupVmSnapshot(final long vmSnapshotId) {
         VMSnapshotVO vmSnapshotVO = _vmSnapshotDao.findById(vmSnapshotId);
         if (vmSnapshotVO == null) {
-            s_logger.warn("VM Snapshot not found. Skip Cleanup. VMSnapshotId: " + vmSnapshotId);
+            logger.warn("VM Snapshot not found. Skip Cleanup. VMSnapshotId: " + vmSnapshotId);
             return true;
         }
         if (VMSnapshot.State.Allocated.equals(vmSnapshotVO.getState())) {