Merge "Kafka replication factor for 4.0"