[ACS41][Patch Request][CLOUDSTACK-2067]

[Marcus Sorensen]

See review request, this patch only partially applies to master, but needed
rework to do so.

https://reviews.apache.org/r/10591/