Fix tool id handling for shed-installed tools #45547

Job	Run time
build-client / build-client	3m 56s
setup-selenium / setup_chromedriver	5s
Test (3.10)	35m 16s
	39m 17s

Provide feedback