[JENKINS-16255] Override variable XYZ+FOO after XYZ.