Resolved conflicts and comments

Author: sandeeplocharla

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

@@ -392,7 +392,7 @@ public void deleteStorageVolume(Volume volume) {
             logger.info("Volume deleted successfully: " + volume.getName());
         } catch (FeignException e) {
             if (e.status() == 404) {
-                logger.warn("deleteStorageVolume: Volume '{}' not found in ONTAP (may not have been created), treating as no-op", volume.getName());
+                logger.warn("deleteStorageVolume: Volume '{}' not found in ONTAP, treating as no-op", volume.getName());
                 return;
             }
             logger.error("Exception while deleting volume: ", e);