JENKINS-6890: Support for Matrix jobs