[DO NOT MERGE] Attempt manual merge from KSQL 6.2.X to 7.0.X

[bideyio]

Description

We need to fix merge conflicts manually due to automatic merge failure - https://jenkins.confluent.io/job/tools-autotasks/job/tools-autotasks/job/apply-pint-merge/2776/console
More context is available in this thread - https://confluent.slack.com/archives/C9Z794XSL/p1689626881653259

To follow the merge procedure use this guide - https://confluentinc.atlassian.net/wiki/spaces/DOC/pages/585564416/Fixing+pint+merge+conflicts

How to reproduce this branch and resolve conflicts. Make sure you are on the master branch.

bwajeetdey@R72YXLWQF6 ~/git/ksql (master?) $ git checkout 6.2.x && git pull --rebase
Updating files: 100% (11829/11829), done.
branch '6.2.x' set up to track 'origin/6.2.x'.
Switched to a new branch '6.2.x'
Already up to date.
bwajeetdey@R72YXLWQF6 ~/git/ksql (6.2.x?) $ git checkout 7.0.x && git pull --rebase
branch '7.0.x' set up to track 'origin/7.0.x'.
Switched to a new branch '7.0.x'
Already up to date.
bwajeetdey@R72YXLWQF6 ~/git/ksql (7.0.x?) $ git checkout -b bdey-ksql-merge-6-7
Switched to a new branch 'bdey-ksql-merge-6-7'
bwajeetdey@R72YXLWQF6 ~/git/ksql (bdey-ksql-merge-6-7?) $ git merge 6.2.x
Auto-merging ksqldb-engine-common/src/test/java/io/confluent/ksql/schema/ksql/DefaultSqlValueCoercerTest.java
Auto-merging ksqldb-engine/src/main/java/io/confluent/ksql/planner/plan/JoinNode.java
CONFLICT (content): Merge conflict in ksqldb-engine/src/main/java/io/confluent/ksql/planner/plan/JoinNode.java
Auto-merging ksqldb-engine/src/main/java/io/confluent/ksql/util/QueryMetadata.java
CONFLICT (content): Merge conflict in ksqldb-engine/src/main/java/io/confluent/ksql/util/QueryMetadata.java
Auto-merging ksqldb-engine/src/test/java/io/confluent/ksql/util/QueryMetadataTest.java
Auto-merging ksqldb-execution/src/main/java/io/confluent/ksql/execution/codegen/helpers/CastEvaluator.java
Auto-merging ksqldb-functional-tests/pom.xml
Auto-merging ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/MaximumLagFilter.java
CONFLICT (content): Merge conflict in ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/MaximumLagFilter.java
Auto-merging ksqldb-rest-app/src/test/java/io/confluent/ksql/rest/integration/PullQueryRoutingFunctionalTest.java
Auto-merging ksqldb-rest-model/src/main/java/io/confluent/ksql/rest/entity/SchemaInfo.java
Auto-merging ksqldb-udf/pom.xml
Auto-merging pom.xml
Automatic merge failed; fix conflicts and then commit the result.

Testing done

Describe the testing strategy. Unit and integration tests are expected for any behavior changes.

Reviewer checklist

• Ensure docs are updated if necessary. (eg. if a user visible feature is being added or changed).
• Ensure relevant issues are linked (description should include text like "Fixes #")
• Do these changes have compatibility implications for rollback? If so, ensure that the ksql command version is bumped.

[cla-assistant]

All committers have signed the CLA.