[ACS4.4] Cherry pick for CLOUDSTACK-6571

[Yoshikazu Nojima]

Hi Daan or Hugo,

Could you cherry pick 03156ecd6f52bfa0c73f1408ac4baca5332d1cad to 4.4?

It contains fix for the bug that prevents cloudstack-agent stop.

Thanks,
Noji