Fix merge conflict with branch-21.12 [databricks]

[jlowe]

Resolves the merge conflict reported in #4267. The conflict was due to file renames, and git was able to resolve the merge conflict automatically without intervention on my part.

NOTE: This must be merged with a merge commit, not squashed!

[jlowe]

build

[jlowe]

CI hit a weird error that seems unrelated:

[2021-12-02T15:45:44.141Z] ImportError while loading conftest '/home/jenkins/agent/workspace/jenkins-rapids_premerge-github-3422-ci-2/integration_tests/src/main/python/conftest.py'.
[2021-12-02T15:45:44.141Z] ../../src/main/python/conftest.py:17: in <module>
[2021-12-02T15:45:44.141Z]     from spark_init_internal import get_spark_i_know_what_i_am_doing
[2021-12-02T15:45:44.141Z] ../../src/main/python/spark_init_internal.py:21: in <module>
[2021-12-02T15:45:44.141Z]     findspark.init()
[2021-12-02T15:45:44.141Z] /usr/local/lib/python3.8/dist-packages/findspark.py:145: in init
[2021-12-02T15:45:44.141Z]     raise Exception(
[2021-12-02T15:45:44.141Z] E   Exception: Unable to find py4j, your SPARK_HOME may not be configured correctly
script returned exit code 4

[jlowe]

build