[ACS41][Patch request] CLOUDSTACK-694 Please pull 6c9fcb8c8f6739c9bad93fea8c28be3a768ca694 into 4.1

[Hugo Trippaers]

Please cherry-pick this commit into 4.1

Related to CLOUDSTACK-694


Cheers,

Hugo