matrix changes
Merge branch 'matrixjob_3' of https://github.com/JeremyMarshall/job-dsl-plugin into matrixjob_3