[ACS4.4] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Can you please cherry pick 7bbad0491f7ec087f693814caadbe6d648d2edf2
It resolves CLOUDSTACK-6671

Thanks,
Amogh