diff --git a/NEWS b/NEWS
index fc9e6c839b1192a2b5c92bbac8bc3d4163092c7e..590f5886234df8e72e47b4ddd752c00ba6ae84dc 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,9 @@ documents those changes that are of interest to users and administrators.
  -- Added infrastructure for setting up federations in database and establishing
     connections between federation clusters.
 
+* Changes in Slurm 16.05.4
+==========================
+
 * Changes in Slurm 16.05.3
 ==========================
  -- Make it so the extern step uses a reverse tree when cleaning up.
diff --git a/doc/html/intel_knl.shtml b/doc/html/intel_knl.shtml
index b7c888e02b56a265bd8fa09b3bcce587e6dcd55b..146fb740ddb6563facdbd00408e51ff0775167c2 100644
--- a/doc/html/intel_knl.shtml
+++ b/doc/html/intel_knl.shtml
@@ -57,7 +57,8 @@ Examples below demonstrate use of HBM.</p>
 
 <p><a name="note"><b>NOTE</b></a>: Slurm version 16.05 and earlier can only
 support homogeneous nodes (e.g. the same number of cores per NUMA node).
-KNL scn4 and quad modes are not homogeneous, but each each NUMA mode will have
+KNL processors with <u>68 cores</u> (a subset of KNL models) will not have
+homogeneous NUMA nodes in scn4 and quad modes, but each each NUMA node will have
 either 16 or 18 cores. This will result in Slurm using the lower core count,
 finding a total of 256 threads rather than 272 threads and setting the node
 to a DOWN state.</p>
@@ -240,6 +241,6 @@ NodeName=nid[00000-00127] State=UNKNOWN
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 6 May 2016</p>
+<p style="text-align:center;">Last modified 26 July 2016</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/testsuite/expect/test1.72 b/testsuite/expect/test1.72
index d4460d583a4749a4df464a61cbd359b29713c325..7a481c5a428938bde35576e372a014bc401c81a0 100755
--- a/testsuite/expect/test1.72
+++ b/testsuite/expect/test1.72
@@ -34,6 +34,10 @@ set test_id   "1.72"
 set freq_val  0
 set exit_code 0
 
+if {[test_cray]} {
+        set timeout 60
+}
+
 if {[get_job_acct_freq] == 0} {
 	send_user "\nWARNING:this test requires JobAcctGatherFrequency to be set\n"
 	exit $exit_code
diff --git a/testsuite/expect/test21.36 b/testsuite/expect/test21.36
index 434755269e52fad184b212dfdfb3ad209e931a86..c0ebf72231844be6e709172bc264b67610b16aa0 100755
--- a/testsuite/expect/test21.36
+++ b/testsuite/expect/test21.36
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Validates that sacctmgr lost jobs returns lost jobs
+#          Validates that sacctmgr runaway jobs returns runaway jobs
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -201,13 +201,13 @@ if {[archive_load $sql_query]} {
 	endit
 }
 
-# Test sacctmgr show lost jobs
+# Test sacctmgr show runaway jobs
 set list_job 0
 # Use temp conf file to use different cluster name.
 set env(SLURM_CONF) $test_conf_file
-spawn $sacctmgr show -i lost jobs
+spawn $sacctmgr show -i runaway jobs
 expect {
-	-re "NOTE: Lost jobs" {
+	-re "NOTE: Runaway jobs" {
 		set list_job 1
 		exp_continue
 	}
@@ -221,16 +221,16 @@ expect {
 }
 
 if {$list_job != 1} {
-	send_user "\nFAILURE: sacctmgr did not find any lost jobs when "
+	send_user "\nFAILURE: sacctmgr did not find any runaway jobs when "
 	send_user "it should have\n"
 	endit
 }
 
 # Check that jobs were fixed
 set list_job 0
-spawn $sacctmgr show -i lost jobs
+spawn $sacctmgr show -i runaway jobs
 expect {
-	-re "No lost jobs found" {
+	-re "No runaway jobs found" {
 		set list_job 1
 		exp_continue
 	}
@@ -244,7 +244,7 @@ expect {
 }
 
 if {$list_job != 1} {
-	send_user "\nFAILURE: sacctmgr found lost jobs when "
+	send_user "\nFAILURE: sacctmgr found runaway jobs when "
 	send_user "it should not have\n"
 	endit
 }
diff --git a/testsuite/expect/test4.13 b/testsuite/expect/test4.13
index 8990ae8e28dbe1b400d51b1928386ea8934fdf8a..d81c876c5ff43e1711e106aac0fec29de8b66ecb 100755
--- a/testsuite/expect/test4.13
+++ b/testsuite/expect/test4.13
@@ -93,6 +93,11 @@ proc cleanup { } {
 
 }
 
+if { ![test_super_user] } {
+        send_user "\nWARNING: This test can't be run without being a super user of the cluster.\n"
+	exit 0
+}
+
 send_user "\n=== Testing Node Information ===\n"
 set first_option 1
 foreach option [array names node_info] {
diff --git a/testsuite/expect/test5.11 b/testsuite/expect/test5.11
index 7651aef478f362ee593e63cc8e69abc5e594b279..2ccfbb9f4efce54426795e4b358681df6b1ec31d 100755
--- a/testsuite/expect/test5.11
+++ b/testsuite/expect/test5.11
@@ -52,6 +52,12 @@ print_header $test_id
 make_bash_script $script "
 sleep 10
 "
+
+if { ![test_super_user] } {
+        send_user "\nWARNING: This test can't be run without being a super user of the cluster.\n"
+        exit 0
+}
+
 proc sub_job { cpu_cnt part } {
 
 	global sbatch script job_id number exit_code