[ACS44] Cherry pick for CLOUDSTACK-6519

[Rajesh Battala]

Hi Daan,

Please cherry-pick to 4.4
260e06d64c07c6e5f3c133d8bdc2779fad62c672
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=260e06d

Thanks
Rajesh Battala