[ACS4.4] cherry-pick commit c91780449ae13d40ba9a2acfc5e0e6176f1beaee

[Rajani Karuturi]

Hi Daan,
Can you cherry-pick commit c91780449ae13d40ba9a2acfc5e0e6176f1beaee from 
4.4-forward to 4.4?
This fixes bug CLOUDSTACK-6781  

~Rajani