Merge release branch 4.18 to 4.19

* 4.18:
  linstor: disconnect-disk also search for resource name in Linstor (#9035)

Author: DaanHoogland

plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java

@@ -316,7 +316,7 @@ private boolean tryDisconnectLinstor(String volumePath, KVMStoragePool pool)
                     null,
                     null);
 
-            optRsc = getResourceByPath(resources, volumePath);
+            optRsc = getResourceByPathOrName(resources, volumePath);
         } catch (ApiException apiEx) {
             // couldn't query linstor controller
             s_logger.error(apiEx.getBestMessage());
@@ -376,9 +376,10 @@ public boolean disconnectPhysicalDisk(Map<String, String> volumeToDisconnect)
         return false;
     }
 
-    private Optional<ResourceWithVolumes> getResourceByPath(final List<ResourceWithVolumes> resources, String path) {
+    private Optional<ResourceWithVolumes> getResourceByPathOrName(
+            final List<ResourceWithVolumes> resources, String path) {
         return resources.stream()
-            .filter(rsc -> rsc.getVolumes().stream()
+            .filter(rsc -> getLinstorRscName(path).equalsIgnoreCase(rsc.getName()) || rsc.getVolumes().stream()
                 .anyMatch(v -> path.equals(v.getDevicePath())))
             .findFirst();
     }