[ACS42]Cherry pick CLOUDSTACK-3405

[Min Chen]

Hi Animesh,

Can you cherry-pick commit 5a11fe77bae1966c986e541e484ae3d56485d78f for 
CLOUDSTACK-3405? The commit is in 4.2-forward branch.

Thanks
-min