Deal with Storage Manager tech debt#12321

DaanHoogland wants to merge 1 commit intomainapache/cloudstack:mainfrom

ghi12316-storageManagerTechDebtapache/cloudstack:ghi12316-storageManagerTechDebtCopy head branch name to clipboard