[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Request you to please cherry-pick the following two commits to 4.4 branch :

1. ac92b3690304ff224e7e2530ea7d8e39f28a05c3 for CLOUDSTACK-6710
2. a4b401f29f83f2f0b467a9d05b509f951b5a3bca for CLOUDSTACK-6358

Thanks,
Amogh