fixes JENKINS-17171 - token macro expansion not working

see https://issues.jenkins-ci.org/browse/JENKINS-17170