Fix NPE on external/unmanaged instance import using custom offerings#12884

winterhazel wants to merge 2 commits intoapache:4.20apache/cloudstack:4.20from

winterhazel:fix-regression-vm-importwinterhazel/cloudstack:fix-regression-vm-importCopy head branch name to clipboard