Merge "[AAI-SDC-DIST] Updgrade AAI to use kafka native"