Add test unit for JENKINS-22641
Merge branch 'JENKINS-22641' of github.com:christ66/jenkins into JENKINS-22641