JENKINS-22514 is only in 1.591

Fixing 9162c3cbb742f13548d5513a26e5b6ef42d62480
Merge remote-tracking branch 'upstream/master'

Merging with upstream