[ACS-4.4] Cherry-pick 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc

[Nitin Mehta]

Daan – Can you please cherry-pick 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc into 
4.4 ?
This is for CLOUDSTACK-6895

Thanks,
-Nitin