[ACS44] Cherry pick for CLOUDSTACK-6585

[Alena Prokharchyk]

Daan,

Can you please cherry pick the commit 8ffb2c11485c178a97dd30f620458684c79d186a, 
to 4.4 branch?

Thanks,
Alena.