diff --git a/NEWS b/NEWS
index b3c51d6458b6fa7b97cdbe8537523ba4529077d1..3275d1b204cffd70c0e9f8459560cff9f6ea6d84 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,9 @@ documents those changes that are of interest to users and administrators.
  -- Fix small memory leak when printing HealthCheckNodeState.
  -- Eliminate memory leaks when AuthInfo is configured.
  -- Improve sdiag output description in man page.
+ -- Cray/capmc_resume script modify a node's features (as needed) when the
+    reinit (reboot) command is issued rather than wait for the nodes to change
+    to the "on" state.
 
 * Changes in Slurm 16.05.0
 ==========================
diff --git a/contribs/cray/capmc_resume.c b/contribs/cray/capmc_resume.c
index f1906899bec154261833e38998338d2c1b8eddc5..8193dc361ffe20efd5153b7d8878554abb6b74c5 100644
--- a/contribs/cray/capmc_resume.c
+++ b/contribs/cray/capmc_resume.c
@@ -688,26 +688,24 @@ int main(int argc, char *argv[])
 	xfree(mcdram_mode);
 	xfree(numa_mode);
 
-	/* Wait for all nodes to change state to "on" */
-	_wait_all_nodes_on();
-
 	if ((argc == 3) && !syscfg_path) {
 		slurm_init_update_node_msg(&node_msg);
 		node_msg.node_names = argv[1];
 		node_msg.features_act = argv[2];
 		rc = slurm_update_node(&node_msg);
+		if (rc != SLURM_SUCCESS) {
+			error("%s: slurm_update_node(\'%s\', \'%s\'): %s\n",
+			      prog_name, argv[1], argv[2],
+			      slurm_strerror(slurm_get_errno()));
+		}
 	}
 
-	if (rc == SLURM_SUCCESS) {
-		exit(0);
-	} else {
-		error("%s: slurm_update_node(\'%s\', \'%s\'): %s\n",
-		      prog_name, argv[1], argv[2],
-		      slurm_strerror(slurm_get_errno()));
-		exit(1);
-	}
+	/* Wait for all nodes to change state to "on" */
+	_wait_all_nodes_on();
 
 	bit_free(node_bitmap);
 	xfree(prog_name);
-	exit(0);
+	if (rc == SLURM_SUCCESS)
+		exit(0);
+	exit(1);
 }
diff --git a/doc/html/mail.shtml b/doc/html/mail.shtml
index 60436d02b810ea6698fd1789bebf558d16f8cbac..852169a9a6a04c53cb1bfb28bf7a88129b3ec507 100644
--- a/doc/html/mail.shtml
+++ b/doc/html/mail.shtml
@@ -16,12 +16,12 @@ Any person subscribed to this mailing list may post to it.
 user community to share information.</p>
 
 <p>You can join either list
-  by <a href="http://lists.schedmd.com/cgi-bin/dada/mail.cgi/list">subscribing
+  by <a href="https://lists.schedmd.com/cgi-bin/dada/mail.cgi/list">subscribing
   here</a>.
 
 <p>
 You can unsubscribe by logging
-into <a href="http://lists.schedmd.com/cgi-bin/dada/mail.cgi/profile_login/">your
+into <a href="https://lists.schedmd.com/cgi-bin/dada/mail.cgi/profile_login/">your
     mailing list profile</a>, or email <a href="mailto:unsubscribe@schedmd.com?Subject=Unsubscribe">unsubscribe@schedmd.com</a>.
 </p>
 
diff --git a/testsuite/expect/inc21.21_tests b/testsuite/expect/inc21.21_tests
index 39dd209a771de63472bd674e47e30804940ae80d..4f3562c045d4b05fe4c06ca79b993f9d3558fd6c 100644
--- a/testsuite/expect/inc21.21_tests
+++ b/testsuite/expect/inc21.21_tests
@@ -60,7 +60,7 @@ proc inc21_21_good { test_type limit } {
 	}
 
 	set matches 0
-	spawn $srun -v -t10 $add [lindex $limit 0][lindex $limit 1] \
+	spawn $srun -v -t1 $add [lindex $limit 0][lindex $limit 1] \
 	    --account=$ta -I $bin_id
 	expect {
 		-re "launching ($number)" {
@@ -635,7 +635,7 @@ proc inc21_21_grpwall { test_type limit } {
 
 	set matches 0
 	send_user "Sleeping for a bit...hang tight\n"
-	spawn $srun -v -t1 [lindex $limit 0][lindex $limit 1] --account=$ta \
+	spawn $srun -v [lindex $limit 0][lindex $limit 1] --account=$ta \
 	    -I $file_in
 	expect {
 		-re "launching ($number)" {
@@ -672,7 +672,7 @@ proc inc21_21_grpwall { test_type limit } {
 	}
 
 	set matches 0
-	spawn $srun -v -t1 [lindex $limit 0][lindex $limit 1] --account=$ta \
+	spawn $srun -v [lindex $limit 0][lindex $limit 1] --account=$ta \
 	    -I $bin_id
 	expect {
 		-re "Job violates accounting/QOS policy" {