[FIXED JENKINS-25064] Instead of constructing the toollocation key, just use the existing descriptor
Merge pull request #20 from mrdfuse/JENKINS-25064

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