[JENKINS-35452] A step towards removing more 'slave' terminology. (cherry picked from commit 7b952de6)
mentioned in commit e5a5e915