Manually resolve the conflicts and update kafka version to 7.5.1-0-ccs

[Zhongyin-Zhang]

The jenkins job fails to auto merge for AK 3.5 to CCS 3.5.
https://jenkins.confluent.io/job/apache-kafka-test/job/3.5/8/console

14:08:02  + ./kafka-test/merge.sh https://github.com/apache/kafka.git 3.5 https://github.com/confluentinc/kafka.git 3.5
14:08:02  => Push changes from the  branch of Apache Kafka to the  branch of Confluent Kafka.
14:08:02  => Merge https://github.com/confluentinc/kafka.git:3.5 with https://github.com/apache/kafka.git:3.5.
14:08:02  => Clone Apache Kafka...
14:08:02  Cloning into '/home/jenkins/workspace/apache-kafka-test_3.5/kafka'...
14:08:20  => Pull latest commits
14:08:20  Already up to date.
14:08:20  Switched to a new branch '3.5'
14:08:20  Branch '3.5' set up to track remote branch '3.5' from 'origin'.
14:08:20  => Add Confluent Kafka as a remote repo.
14:08:20  confluent	https://github.com/confluentinc/kafka.git (fetch)
14:08:20  confluent	https://github.com/confluentinc/kafka.git (push)
14:08:20  origin	https://github.com/apache/kafka.git (fetch)
14:08:20  origin	https://github.com/apache/kafka.git (push)
14:08:20  => Merge confluent/3.5
14:08:21  From https://github.com/confluentinc/kafka
14:08:21   * branch                  3.5        -> FETCH_HEAD
14:08:21   * [new branch]            3.5        -> confluent/3.5
14:08:21  Auto-merging tests/kafkatest/version.py
14:08:21  CONFLICT (content): Merge conflict in tests/kafkatest/version.py
14:08:21  Auto-merging tests/kafkatest/__init__.py
14:08:21  CONFLICT (content): Merge conflict in tests/kafkatest/__init__.py
14:08:21  Auto-merging streams/quickstart/pom.xml
14:08:21  CONFLICT (content): Merge conflict in streams/quickstart/pom.xml
14:08:21  Auto-merging streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
14:08:21  CONFLICT (content): Merge conflict in streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
14:08:21  Auto-merging streams/quickstart/java/pom.xml
14:08:21  CONFLICT (content): Merge conflict in streams/quickstart/java/pom.xml
14:08:21  Auto-merging gradle/dependencies.gradle
14:08:21  Auto-merging gradle.properties
14:08:21  CONFLICT (content): Merge conflict in gradle.properties
14:08:21  Automatic merge failed; fix conflicts and then commit the result.
14:08:21  => Pull 'Jenkinsfile' from confluent/3.5
14:08:21  Updated 0 paths from 48a6c3170d
14:08:21  => Continue with confluent/3.5 merge
14:08:21  error: Committing is not possible because you have unmerged files.
14:08:21  hint: Fix them up in the work tree, and then use 'git add/rm <file>'
14:08:21  hint: as appropriate to mark resolution and make a commit.
14:08:21  fatal: Exiting because of an unresolved conflict.
14:08:21  U	gradle.properties
14:08:21  U	streams/quickstart/java/pom.xml
14:08:21  U	streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
14:08:21  U	streams/quickstart/pom.xml
14:08:21  U	tests/kafkatest/__init__.py
14:08:21  U	tests/kafkatest/version.py

Manually resolve the conflicts. And update the kafka version to 7.5.1-0-ccs