Merge "[STRIMZI] Make Strimzi ServiceMesh compatible"