[ACS 4.4] Cherry pick request

[Amogh Vasekar]

Hi Daan,
Can you please cherry-pick c8ca15b95a57a3d79b71c76c913e295f6490f05d

This is for CLOUDSTACK-6358.

Thanks,
Amogh