[ACS42] Cherry pick CLOUDSTACK-4495

[Prachi Damle]

Hi Animesh,

Can you cherry-pick the following patch to 4.2: 
https://reviews.apache.org/r/13804/

Commit hash:   208507a42a4db252dc3d7cf299c146315423a071
Contained in branches: 4.2-forward

Thanks,
Prachi