Convert to using Simplejob and requesting the cluster number
and get rid of old submit file. #4232
Covert to have test job be via SimpleJob, request the cluster be
returned and loose the old dedicated submit file. #4232