[ACS44]cherry-pick commit 8bcd2546ac159bbfa778c7a023065a1efc7edd5e

[Murali Reddy]

Daan,

Please cherry pick commit 8bcd2546ac159bbfa778c7a023065a1efc7edd5e in
4.4-forward for CLOUDSTACK-6672 into 4.4

Thanks,
Murali