Merge "Revert "Make cassandra service mesh compliant""