[ACS44] Cherry pick for cloudstack-6472

[Sebastien Goasguen]

Daan,

Can you cherry pick from 4.4-forward:

f328f6157b682abc5bce007400f1cdf476097745

and

fe84b674c14b6494770b489100e92a116b3b1f49

thanks

-sebastien