Merge 'trilinos/Trilinos:develop' (34f77dc) into 'tcad-charon/Trilino…

…s:develop' (c7c52c5).

* trilinos-develop:
  Revert commit 75febde (trilinos#8471)
  Ifpack2: fix timers
  Automatic snapshot commit from tribits at 18f7981
  Automatic snapshot commit from tribits at 0591d05
  We don't need tweeks files for spack-rhel contributed (ATDV-406)
  MueLu: regionMG replacing Map with const Map where possible to avoid casting
  Bring back ride, remove serrano
  Restore Ride files
  Revert cee-rhel6 and ride/white changes, move spack-rhel to contributed
  Remove unneeded systems from README & associated ctest dirs
  Revert "Remove Configurations marked as Non Needed"
  Remove entire directory for systems with no listed supported builds.
  Remove Configurations marked as Non Needed

cmake/ctest/drivers/atdm/README.md

@@ -464,28 +464,11 @@ there is no tractability for changes in these settings!
 ## Specific <system_name> directories
 
 The following `<system_name>` sub-directories exist (in alphabetical order):
- 
 * `cee-rhel6/`: Contains files to drive builds on CEE LAnL RHEL6 machines with
   a SEMS environment.
 
-* `mutrino/`: Contains files to drive builds on SNL machine mutrino.
-
 * `ride/`: Contains the files to drive builds on the SRN test bed machine
   `ride` which also can be run on the SON machine `white`.
- 
-* `sems-rhel6/`: Contains files to drive builds on rhel6 machines with the SEMS
-  environment.
-
-* `sems_gcc-7.2.0/`: Contains driver scripts for an on-off GCC 7.2.0 build
-  based on the SEMS system.  This build really does not fit into the system
-  described above but it put in this directory since it is targeted to support
-  ATDM.  It also shows that a given system can have its own driver files if it
-  needs to.
-
-* `serrano/`: Contains files to drive builds on the SRN HPC machine `serrano`.
-
-* `shiller/`: Contains the files to drive builds on the SRN test bed machine
-  `shiller` which also can be run on the SON machine `hansen`.
 
 * `tlcc2/`: Contains files to drive builds on the SRN HPC TLCC-2 machines
   (e.g. 'chama', 'skybridge', etc.).