[FIXED JENKINS-25064] Instead of constructing the toollocation key, just use the existing descriptor

Ok I have been testing this change in production for a day, with several jobs being built on swarm slaves. All seems ok now.