Add back missing changes from #10008 to 4.23 - #13817

Add back missing changes from #10008 to 4.23#13817

winterhazel wants to merge 1 commit into

apache:mainapache/cloudstack:mainfrom

winterhazel:add-missing-10008-changeswinterhazel/cloudstack:add-missing-10008-changesCopy head branch name to clipboard