[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Can you please cherry-pick 594f66d12521c6a3a07475e37e7ab0f09d247b19
It is a fix for https://issues.apache.org/jira/browse/CLOUDSTACK-6437

Thanks,
Amogh