[acs-4.4] cherry-pick

[Damoder Reddy]

Hi,

Please cherry-pick the following commit to 4.4 from 4.4-forward

24401e0b2b575d1aa151dbf5d4e0e0e1de4e9361 - The fix is for 
https://issues.apache.org/jira/browse/CLOUDSTACK-6444


Thanks & Regards
Damodar/