Hi Daan, Can you please cherry pick the following two commits, in order?
8f37841eb49532a729c9cc42a61e610da05b04a3 5949e33578a886061b18510cf5cfbd8c2b4e4c3b They are for CLOUDSTACK-6358 Thanks, Amogh
- [ACS44] Cherry pick requests Amogh Vasekar
- [ACS44] Cherry pick for CLOUDSTACK-6647 Kelven Yang
- Re: [ACS44] Cherry pick for CLOUDSTACK-6647 Daan Hoogland
- [ACS44] Cherry pick requests Min Chen
- Re: [ACS44] Cherry pick requests Daan Hoogland
