Changing CDS jobs to run with mvn36