[ACS4.4] cherry-pick commit 2ab7bcade2f37cb17e071a6154fdae1d80e4ff99

[Rajani Karuturi]

Hi Daan,

Can you cherry-pick commit 2ab7bcade2f37cb17e071a6154fdae1d80e4ff99 from 
4.4-forward to 4.4?
This fixes bug CLOUDSTACK-6756

~Rajani