Hotfix for CLOUDSTACK-7260 is back ported to 4.3

[Min Chen]

Hi Ilya,

Per your request and instruction, I have back ported hot fix for 
CLOUDSTACK-7260 to ACS 4.3 branch.

Thanks
-min