Update test-train1k.sh
Merge branch 'patch-1' of https://github.com/jenkinsSAGrid/SoftwareTests into jenkinsSAGrid-patch-1
Merge branch 'jenkinsSAGrid-patch-1'
Merge branch 'master' of https://github.com/SAGridOps/SoftwareTests

Conflicts:
	scikit-learn/test-train1k.sh