Merge remote-tracking branch 'origin/slurm-2.4'

Conflicts:
	src/srun/opt.c

src/plugins/launch/runjob/launch_runjob.c

@@ -262,7 +262,7 @@ extern int launch_p_setup_srun_opt(char **rest)
 		if (_verbose)
 			command_pos += 2;
 		if (opt.ifname) {
-			if (parse_uint32(opt.ifname, &taskid)
+			if (!parse_uint32(opt.ifname, &taskid)
 			    && ((int) taskid < opt.ntasks)) {
 				command_pos += 2;
 			}