Merge branch '4.19'

Author: JoaoJandre

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java

@@ -535,7 +535,7 @@ public void handleTemplateSync(DataStore store) {
                             }
                             // if this is private template, skip sync to a new image store
                             if (isSkipTemplateStoreDownload(tmplt, zoneId)) {
-                                s_logger.info("Skip sync downloading private template " + tmplt.getUniqueName() + " to a new image store");
+                                logger.info("Skip sync downloading private template " + tmplt.getUniqueName() + " to a new image store");
                                 continue;
                             }
 

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java

@@ -914,11 +914,11 @@ public boolean deleteStoragePool(String uuid) {
 
         // decrement and check if storage pool still in use
         if (decStoragePoolRefCount(uuid)) {
-            s_logger.info(String.format("deleteStoragePool: Storage pool %s still in use", uuid));
+            logger.info(String.format("deleteStoragePool: Storage pool %s still in use", uuid));
             return true;
         }
 
-        Connect conn;
+        Connect conn = null;
         try {
             conn = LibvirtConnection.getConnection();
         } catch (LibvirtException e) {