cherry-pick CLOUDSTACK-4539

[Vijayendra Bhamidipati]

Hi Animesh,

Requesting that you cherry-pick commit #  
a30a33c14d38a30840be19619c9aff65ed14cf2f from 4.2-forward to 4.2 for bug 
CLOUDSTACK-4539. I've checked the patch into master as well in commit # 
e6247e712588903b77313b50750e9a0e7d0cf2af.

Thanks,
Regards,
Vijay