Added test for JENKINS-21394