Fixed merge conflicts #26

Job	Run time
core-modules (hadoop3, 8)	21s
core-modules (hadoop3, 11)	19s
default-build (8)	2m 9s
default-build (11)	1m 18s
flink-test-and-flink-integration-test (3.9, 116)	27s
flink-test-and-flink-integration-test (3.9, 117)	28s
interpreter-test-jupyter-python-rlang (3.9, 8)	6m 15s
flink-test-and-flink-integration-test (3.8, 115)	28s
interpreter-test-jupyter-python-rlang (3.9, 11)	6m 6s
interpreter-test-non-core (8)	16s
interpreter-test-jupyter-python-rlang (3.7, 8)	22m 49s
interpreter-test-non-core (11)	15s
livy-0-8-with-spark-2-4-under-python37	33m 3s
interpreter-test-jupyter-python-rlang (3.8, 8)	6m 6s
spark-integration-test (3, 8)	23s
spark-test (3.9, 8)	16s
spark-integration-test (3, 11)	26s
zeppelin-integration-test (8)	28s
spark-test (3.9, 11)	13s
zeppelin-integration-test (11)	45s
spark-test (3.7, 8)	19s
spark-test (3.8, 8)	10s
	1h 23m 20s

Provide feedback