Merge release branch 4.20 to main

* 4.20:
  UI: Tooltip on the host information card to display the CPU speed in MHz and the memory value in MB (to 3 decimal places) (apache#9971)
  UI: Allow accounts of the `User` type to add other accounts or users to projects through UI (apache#9927)
  enable to create VPC portfowarding rules with source cidr (apache#7081)
  Add new column `last_id` to the table volumes (apache#9759)
  Allow VMWare import via another host (apache#9787)
  Linstor: add support for ISO block devices and direct download (apache#9792)
  get expunged VM data for job result (apache#9949)
  fix section divider display on auth page (apache#9966)

Author: DaanHoogland

core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java

@@ -38,6 +38,15 @@ public String getTemporaryConvertUuid() {
         return temporaryConvertUuid;
     }
 
+    public ConvertInstanceAnswer(Command command, String temporaryConvertUuid) {
+        super(command, true, "");
+        this.temporaryConvertUuid = temporaryConvertUuid;
+    }
+
+    public String getTemporaryConvertUuid() {
+        return temporaryConvertUuid;
+    }
+
     public UnmanagedInstanceTO getConvertedInstance() {
         return convertedInstance;
     }

engine/schema/src/main/java/com/cloud/storage/VolumeVO.java

@@ -693,7 +693,7 @@ public boolean isDeleteProtection() {
     public void setDeleteProtection(boolean deleteProtection) {
         this.deleteProtection = deleteProtection;
     }
-    
+
     public long getLastId() {
         return lastId;
     }

server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

@@ -1648,7 +1648,7 @@ protected UserVm importUnmanagedInstanceFromVmwareToKvm(DataCenter zone, Cluster
 
             temporaryConvertLocation = selectInstanceConversionTemporaryLocation(
                     destinationCluster, convertHost, convertStoragePoolId);
-           DiskOffering diskOffering = diskOfferingDao.findById(serviceOffering.getDiskOfferingId());
+            DiskOffering diskOffering = diskOfferingDao.findById(serviceOffering.getDiskOfferingId());
             List<StoragePoolVO> convertStoragePools = primaryDataStoreDao.findPoolsByTags(zone.getId(), destinationCluster.getPodId(), destinationCluster.getId(), diskOffering.getTagsArray(), true, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value());
             long importStartTime = System.currentTimeMillis();
             Pair<UnmanagedInstanceTO, Boolean> sourceInstanceDetails = getSourceVmwareUnmanagedInstance(vcenter, datacenterName, username, password, clusterName, sourceHostName, sourceVMName);