[ACS42] Please cherry pick for CLOUDSTACK-4530

[Min Chen]

Hi Animesh,

Can you please cherry pick 4ba68e3b3fd58bd1e7333bb68e8970b3af7a954f from 
4.2-forward for CLOUDSTACK-4530?

Thanks
-min