[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Can you please cherry-pick de04881da177b28d7cb3efc09adb2d8069f0fdd3 from
4.4-forward to 4.4?

This fixes CLOUDSTACK-6915

Thanks,
Amogh