fix for new numcpus instead of numprocs

testsuite/expect/test15.10

@@ -49,7 +49,7 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
 			send "$scontrol show job $job_id\r"
 			exp_continue
 		}
-		-re "NumProcs=($number).*" {
+		-re "NumCPUs=($number).*" {
 			set tasks_get $expect_out(1,string)
 			send "exit\r"
 			exp_continue

testsuite/expect/test17.6

@@ -71,7 +71,7 @@ expect {
 if {$job_id != 0} {
 	spawn $scontrol show job $job_id
 	expect {
-		-re "NumProcs=($number)" {
+		-re "NumCPUs=($number)" {
 			set tasks $expect_out(1,string)
 			exp_continue
 		}