Merge pull request #18728 from jmchilton/tool_upgrade #1088

Job	Run time
build-client / build-client	10m 28s
setup-selenium / setup_chromedriver	4s
Test (3.8, 0)	42m 17s
Test (3.8, 1)	53m 24s
Test (3.8, 2)	50m 17s
	2h 36m 30s

Provide feedback