[FIXED JENKINS-25559] - Proper search of the effective client name for running builds

Fixes errors merged with #60