[ACS44] Cherry-Pick

[Santhosh Edukulla]

Hi Daan,

Please cherry pick the below commit. 

Bugid: CLOUDSTACK-6791

Commit id : 62cc238e1276bad1af7934fe5c150fe801b89140

Thanks!
Santhosh