[ACS42] Cherry pick for CLOUDSTACK-4454 and CLOUDSTACK-4455

[Min Chen]

Hi Animesh,

        Can you please cherry-pick the following two commits to 4.2?

        52f08a4f36c35ac9827a1d253b000bfcd6f9d723   (CLOUDSTACK-4454)
        18aacd48a2cac2f66b6ff7c70a73dc39b8d6ece1   (CLOUDSTACK-4455)

        Thanks
        -min