[ACS4.4] cheery-pick request

[Rajani Karuturi]

Hi Daan,

Can you cherry-pick the below commits from 4.4-forward to 4.4?

commit c5a1423d3d02e33c33eb630f6f4df24b731eba69 - CLOUDSTACK-6808

commit cc663bb7fc515a4960cd483e8f5697bc141ce95e - CLOUDSTACK-6669


~Rajani