cherry pick commit to 4.3

[Jayapal Reddy Uradi]

Hi Animesh,

Please cherry pick the below commit to 4.3 from 4.3-forward.

e8f93f28fc424c73156723d9b65b13c05dafc5a8

Bug-id: CLOUDSTACK-6083

Thanks,
Jayapal