Merge "[AAI] AAI-EVENT publishing fix for https"