diff --git a/cmake/std/PullRequestLinuxDriver.sh b/cmake/std/PullRequestLinuxDriver.sh
index 93250dd546f8..e62c84fd4c98 100755
--- a/cmake/std/PullRequestLinuxDriver.sh
+++ b/cmake/std/PullRequestLinuxDriver.sh
@@ -1,4 +1,5 @@
-#!/bin/env bash
+#!/usr/bin/env bash
+# set -x  # echo commands
 
 export https_proxy=https://wwwproxy.sandia.gov:80
 export http_proxy=http://wwwproxy.sandia.gov:80
@@ -100,14 +101,6 @@ exit $ierror
 fi
 
 cd ../
-#process list of changes here with script and save to 'packageEnables'
-declare packageEnables=$(bash Trilinos/commonTools/test/utilities/changedPackages.bash)
-ierror=$?
-if [[ $ierror != 0 ]]; then
-echo "There was an issue creating the list of package enables. The error code was: $ierror"
-exit $ierror
-fi
-echo "List of package enables is: $packageEnables"
 
 # Set up the full environment for the build
 if [ "Trilinos_pullrequest_gcc_4.8.4" == "${JOB_BASE_NAME:?}" ]
@@ -134,6 +127,18 @@ then
     echo "There was an issue loading the intel environment. The error code was: $ierror"
     exit $ierror
   fi
+# --- BEGIN SCAFFOLDING ---
+# nurgleflurgle... name match!  can we change this to a regex or something to
+# allow separate testing jobs!?
+#elif [ "Trilinos_pullrequest_gcc_4.9.3_wcmclen_test" == "${JOB_BASE_NAME:?}" ]
+#then
+#  source Trilinos/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
+#  ierror=$?
+#  if [[ $ierror != 0 ]]; then
+#    echo "There was an issue loading the gcc environment. The error code was: $ierror"
+#    exit $ierror
+#  fi
+# --- END SCAFFOLDING ---  
 else
   ierror=42
   echo "There was an issue loading the proper environment. The error code was: $ierror"
@@ -154,7 +159,16 @@ echo "CDash Track = ${CDASH_TRACK:?}"
 #-------------------------------------
 # Doing configure/build/test/submit
 #-------------------------------------
-echo $packageEnables | sed -e "s/-D\([^= ]*\)=\([^ ]*\)/set(\1 \2 CACHE BOOL \"Enabled by PR package enable file.\")^/g" | tr "^" "\n" > packageEnables.cmake
+rm packageEnables.cmake
+changed_packages_app=Trilinos/commonTools/framework/get-changed-trilinos-packages.sh
+${changed_packages_app} ${TRILINOS_SOURCE_SHA} ${TRILINOS_TARGET_SHA} packageEnables.cmake
+
+ierror=$?
+if [[ $ierror != 0 ]]; then
+    echo "There was an issue generating packageEnables.cmake.  The error code was: $ierror"
+    exit $ierror
+fi
+
 
 build_name="PR-$PULLREQUESTNUM-test-$JOB_BASE_NAME-$BUILD_NUMBER"
 
@@ -164,15 +178,19 @@ cd TFW_testing_single_configure_prototype
 
 if [ "icc" == ${CC:?} ]
 then
-  CONFIG_SCRIPT=PullRequestLinuxIntelTestingSettings.cmake
+    CONFIG_SCRIPT=PullRequestLinuxIntelTestingSettings.cmake
 else
-  if [ "Trilinos_pullrequest_gcc_4.8.4" == "${JOB_BASE_NAME:?}" ]
-  then
-    CONFIG_SCRIPT=PullRequestLinuxGCC4.8.4TestingSettings.cmake
-  elif [ "Trilinos_pullrequest_gcc_4.9.3" == "${JOB_BASE_NAME:?}" ]
-  then
-    CONFIG_SCRIPT=PullRequestLinuxGCC4.9.3TestingSettings.cmake
-  fi
+    if [ "Trilinos_pullrequest_gcc_4.8.4" == "${JOB_BASE_NAME:?}" ]; then
+        CONFIG_SCRIPT=PullRequestLinuxGCC4.8.4TestingSettings.cmake
+    elif [ "Trilinos_pullrequest_gcc_4.9.3" == "${JOB_BASE_NAME:?}" ]; then
+        CONFIG_SCRIPT=PullRequestLinuxGCC4.9.3TestingSettings.cmake
+    # --- BEGIN SCAFFOLDING ---
+    # nurgleflurgle... name match!  can we change this to a regex or something to
+    # allow separate testing jobs!?
+    #elif [ "Trilinos_pullrequest_gcc_4.9.3_wcmclen_test" == "${JOB_BASE_NAME:?}" ]; then
+    #    CONFIG_SCRIPT=PullRequestLinuxGCC4.9.3TestingSettings.cmake
+    # --- END SCAFFOLDING ---
+    fi
 fi
 
 ctest -S simple_testing.cmake \
@@ -205,3 +223,6 @@ fi
 
 #pushd Trilinos/cmake/ctest/drivers/parameterized
 #ctest -S ctest_linux_nightly_generic.cmake
+
+
+
diff --git a/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
index 7d6db18d67f4..644bff47e840 100644
--- a/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
+++ b/cmake/std/sems/PullRequestGCC4.8.4TestingEnv.sh
@@ -22,6 +22,12 @@ module load sems-parmetis/4.0.3/parallel
 module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
+# Load the SEMS CMake Module
+# - One of the SEMS modules will load CMake 3.4.x also,
+#   so this will pull in the SEMS cmake 3.10.3 version
+#   for Trilinos compatibility.
+module load sems-cmake/3.10.3
+
 # Using CMake and Ninja modules from the ATDM project space.
 # SEMS does not yet supply a recent enough version of CMake
 # for the single configure/build/test capability. We are also
diff --git a/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh b/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
index 994a73a63400..72c012e142d6 100644
--- a/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
+++ b/cmake/std/sems/PullRequestGCC4.9.3TestingEnv.sh
@@ -4,10 +4,6 @@
 
 # usage: $ source PullRequestGCC4.9.3TestingEnv.sh
 
-# After the environment is no longer needed, it can be purged using
-# $ module purge
-# or Trilinos/cmake/unload_sems_dev_env.sh
- 
 source /projects/sems/modulefiles/utils/sems-modules-init.sh
 
 module load sems-gcc/4.9.3
@@ -22,6 +18,12 @@ module load sems-parmetis/4.0.3/parallel
 module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
+# Load the SEMS CMake Module
+# - One of the SEMS modules will load CMake 3.4.x also,
+#   so this will pull in the SEMS cmake 3.10.3 version
+#   for Trilinos compatibility.
+module load sems-cmake/3.10.3
+
 # Using CMake and Ninja modules from the ATDM project space.
 # SEMS does not yet supply a recent enough version of CMake
 # for the single configure/build/test capability. We are also
@@ -32,3 +34,4 @@ module load atdm-env
 module load atdm-cmake/3.11.1
 module load atdm-ninja_fortran/1.7.2
 
+
diff --git a/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh b/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
index dc6388cbd6d7..2b0d583d7536 100644
--- a/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
+++ b/cmake/std/sems/PullRequestIntel17.0.1TestingEnv.sh
@@ -24,6 +24,12 @@ module load sems-parmetis/4.0.3/parallel
 module load sems-scotch/6.0.3/nopthread_64bit_parallel
 module load sems-superlu/4.3/base
 
+# Load the SEMS CMake Module
+# - One of the SEMS modules will load CMake 3.4.x also,
+#   so this will pull in the SEMS cmake 3.10.3 version
+#   for Trilinos compatibility.
+module load sems-cmake/3.10.3
+
 # Using CMake and Ninja modules from the ATDM project space.
 # SEMS does not yet supply a recent enough version of CMake
 # for the single configure/build/test capability. We are also
diff --git a/commonTools/test/utilities/changedPackages.bash b/commonTools/test/utilities/changedPackages.bash
index 27754deeced3..722485a85f61 100644
--- a/commonTools/test/utilities/changedPackages.bash
+++ b/commonTools/test/utilities/changedPackages.bash
@@ -1,5 +1,8 @@
 #!/bin/env bash
 
+# 2018-08-01 : This script is deprecated in the PR testing suite and 
+#              is replaced by `commonTools/framework/get-changed-trilinos-packages.sh`
+
 #The purpose of this file is to generate a list of package enables that
 #when used with forward packages turned on will result in the right set of
 #tests being run to test a pull request. The current implementation is neither