Merge "[DMAAP] DMaaP ServiceMesh compatibility"