[ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

[Nitin Mehta]

Hi Daan,
Can you please cherry-pick the following commit 
d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de in 4.4 for CLOUDSTACK-6699 ?

Thanks,
-Nitin