[FIXED JENKINS-17913] Expand variables