[ACS4.4] Cherry pick 7694bee83f53a16537032bed3902ef8b4f95c4ab

[Amogh Vasekar]

Hi Daan / Hugo,

Can you please cherry pick commit 7694bee83f53a16537032bed3902ef8b4f95c4ab
This is to fix https://issues.apache.org/jira/browse/CLOUDSTACK-6516

Thanks,
Amogh