fixed JENKINS-24297 by adding a workaround for JENKINS-24298
Merge remote-tracking branch 'upstream/master' into JENKINS-24146-rbenv-wrapper