Reverted the fix for NFS3 Cancel Maintenance failure

Author: Locharla, Sandeep

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

@@ -457,10 +457,10 @@ public boolean deleteStoragePool(StoragePoolType type, String uuid) {
 
     public boolean deleteStoragePool(StoragePoolType type, String uuid, Map<String, String> details) {
         StorageAdaptor adaptor = getStorageAdaptor(type);
-        boolean deleteStatus = adaptor.deleteStoragePool(uuid, details);
         if (type == StoragePoolType.NetworkFilesystem) {
             _haMonitor.removeStoragePool(uuid);
         }
+        boolean deleteStatus = adaptor.deleteStoragePool(uuid, details);
         synchronized (_storagePools) {
             _storagePools.remove(uuid);
         }

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

@@ -948,11 +948,6 @@ private boolean destroyStoragePoolHandleException(Connect conn, String uuid) {
         return false;
     }
 
-    @Override
-    public boolean deleteStoragePool(String uuid, Map<String, String> details) {
-        return deleteStoragePool(uuid);
-    }
-
     @Override
     public boolean deleteStoragePool(String uuid) {
         logger.info("Attempting to remove storage pool " + uuid + " from libvirt");