[ACS42] Cherry pick request for CLOUDSTACK-4471

[Likitha Shetty]

Hi Animesh,

Can you please cherry-pick 7cc8ccead541f6089ed48d9a1c335daa458b74fc from 
4.2-forward branch as a fix for issue CLOUDSTACK-4471.

Thanks,
Likitha