[ACS 4.3] Cherry pick request for CLOUDSTACK-5927

[Likitha Shetty]

Please cherry pick commit 94ea2736f4a1614e45f4bc56388aad7adeb22a08 from 
4.3-forward branch to 4.3 branch.

Thanks,
Likitha