CLOUDSTACK-10227: Stabilization fixes for 4.11.0.0

- Test and regression fixes
- Packaging/systemvmtemplate fixes
- DB upgrade path related fixes
- Upgrade and post-upgrade failure fixes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

server/src/com/cloud/template/HypervisorTemplateAdapter.java

@@ -451,6 +451,7 @@ public boolean delete(TemplateProfile profile) {
 
         if (imageStores == null || imageStores.size() == 0) {
             // already destroyed on image stores
+            success = true;
             s_logger.info("Unable to find image store still having template: " + template.getName() + ", so just mark the template removed");
         } else {
             // Make sure the template is downloaded to all found image stores
@@ -536,10 +537,7 @@ public boolean delete(TemplateProfile profile) {
                                 templateZoneDao.remove(templateZone.getId());
                             }
                         }
-                    } catch (InterruptedException e) {
-                        s_logger.debug("Delete template Failed", e);
-                        throw new CloudRuntimeException("Delete template Failed", e);
-                    } catch (ExecutionException e) {
+                    } catch (InterruptedException|ExecutionException e) {
                         s_logger.debug("Delete template Failed", e);
                         throw new CloudRuntimeException("Delete template Failed", e);
                     }
@@ -551,7 +549,7 @@ public boolean delete(TemplateProfile profile) {
 
         }
         if (success) {
-            if ((imageStores.size() > 1) && (profile.getZoneIdList() != null)) {
+            if ((imageStores != null && imageStores.size() > 1) && (profile.getZoneIdList() != null)) {
                 //if template is stored in more than one image stores, and the zone id is not null, then don't delete other templates.
                 return success;
             }

test/integration/smoke/test_volumes.py

@@ -634,10 +634,8 @@ def test_07_resize_fail(self):
         elif hosts[0].hypervisor.lower() in ("vmware", "hyperv"):
             self.skipTest("Resize Volume is unsupported on VmWare and Hyper-V")
 
-        # Attempting to resize it should throw an exception, as we're using a non
-        # customisable disk offering, therefore our size parameter should be ignored
-        with self.assertRaises(Exception):
-            self.apiClient.resizeVolume(cmd)
+        # Online resize should be supported
+        self.apiClient.resizeVolume(cmd)
 
         if hosts[0].hypervisor == "XenServer":
             self.virtual_machine.start(self.apiClient)