Merge branch 'slurm-17.02' into slurm-17.11

testsuite/expect/test36.2

@@ -117,6 +117,7 @@ expect {
 cancel_job $job_id
 if {$exit_code == 0} {
 	if {$job_found == 1} {
+		exec $bin_rm -f file_in
 		send_user "\nSUCCESS\n"
 	} else {
 		send_user "\nFAILURE: bjobs $job_id does not work\n"

testsuite/expect/test36.3

@@ -152,6 +152,7 @@ if {$state_match != 1} {
 }
 
 if {$exit_code == 0} {
+	exec $bin_rm -f file_in
 	send_user "\nSUCCESS\n"
 }