JUnit 4.
Merge branch 'master' of github.com:jenkinsci/jenkins
[JENKINS-10502] Noting.