[ACS42] cherry pick commit 5b319ba0cb46160451ec05de32a8409b44a08f5b

[Devdeep Singh]

Hi Animesh,

This is a fix for bug https://issues.apache.org/jira/browse/CLOUDSTACK-4470. 
Can you cherry pick commit 5b319ba0cb46160451ec05de32a8409b44a08f5b to 4.2 
branch?

Regards,
Devdeep