Merge pull request #2046 from susegrant/patch-5
azure-events: backport relevant changes from azure-events-az