Support for MatrixJob
resolve conflict in CloneWorkspace.
Merge pull request #3 from trnl/master

JENKINS-6890: Support for Matrix jobs