Merge remote-tracking branch 'origin/4.13'

Author: yadvr

server/src/main/java/com/cloud/hypervisor/KVMGuru.java

@@ -132,7 +132,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
             guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion());
         }
         if (guestOsMapping == null || host == null) {
-            to.setPlatformEmulator("Other");
+            to.setPlatformEmulator(guestOS.getDisplayName() == null ? "Other" : guestOS.getDisplayName());
         } else {
             to.setPlatformEmulator(guestOsMapping.getGuestOsName());
         }

server/src/main/java/com/cloud/server/StatsCollector.java

@@ -928,13 +928,7 @@ protected void runInContext() {
                     List<VolumeVO> volumes = _volsDao.findByPoolId(pool.getId(), null);
                     List<String> volumeLocators = new ArrayList<String>();
                     for (VolumeVO volume : volumes) {
-                        if (volume.getFormat() == ImageFormat.QCOW2) {
-                            if (pool.isManaged()) {
-                                volumeLocators.add(volume.getPath());
-                            } else {
-                                volumeLocators.add(volume.getUuid());
-                            }
-                        } else if (volume.getFormat() == ImageFormat.VHD) {
+                        if (volume.getFormat() == ImageFormat.QCOW2 || volume.getFormat() == ImageFormat.VHD) {
                             volumeLocators.add(volume.getPath());
                         } else if (volume.getFormat() == ImageFormat.OVA) {
                             volumeLocators.add(volume.getChainInfo());