[marvin, VMware] Fix repeated test failures observed on 'main' branch#5992

nvazquez merged 4 commits into

apache:mainapache/cloudstack:mainfrom

shapeblue:fix-change-svc-offering-testshapeblue/cloudstack:fix-change-svc-offering-testCopy head branch name to clipboard