[ACS4.4] Cherry pick for CLOUDSTACK-6483

[Brian Federle]

Please cherry-pick 4.4-forward commits for CLOUDSTACK-6483 (in this order):

0b03609c45ecb5b4525e6a7b5216c70032d94a39
7daabf6515509dc276b968c6ca042cf964a328da
430d14b67608039159403036dae3dc7af1e590f5

Thank you,
Brian