Shylu : major revamp. What was theoretically possible is now
 actually possible. Adding Ifpack as an block diagonal factorization in ShyLU.
 Not the cleanest implementation, but works for now.
Merge branch 'master' of software.sandia.gov:/space/git/Trilinos
Kokkos: Fix a warning about a shadowed variable

This was previously fixed by both Eric and me, but in a way that
it cancelled each other ....
SEACAS: exodiff - modify interpolation capability use more logical proportion definition; fix interpolation

(From Sierra)

Build/Test Cases Summary
Enabled Packages: SEACASExodiff
Disabled Packages: Panzer,PyTrilinos,SEACASExo2mat,SEACASMat2exo
Enabled all Forward Packages
0) MPI_DEBUG => Skipped configure, build, test due to no enabled packages! => Does not affect push readiness! (-1.00 min)
1) SERIAL_RELEASE => Skipped configure, build, test due to no enabled packages! => Does not affect push readiness! (-1.00 min)
2) MPI_DEBUG_SS => passed: passed=3,notpassed=0 (1.69 min)
3) SERIAL_RELEASE_SS => passed: passed=5,notpassed=0 (1.70 min)
Turning on all packages for memory build.  We can turn some off as needed.
Updating s903186 testsing after OS upgrade.
Some additional testing changes.  Now testing native GCC4.2.1 in serial.
MueLu: fixing SubBlockAFactory warning

We were checking if row or column are negative, but we have previously
casted it to size_t, so that is meaningless.
Fixed bug in trapezoid rule implicit integrator for second-order ODEs.
Kokkos: fix mac build errors
Made MeshAdapter naming consistent
Ifpack2:  Replace MV::operator=() with deep_copy() for KokkosRefactor.

The Kokkos refactor of Tpetra is also changing the semantics of
Vector/MultiVector from value semantics to view semantics.  This means
operator=() is no longer a deep copy in that branch.  This commit
replaces operator=() for Chebyshev with Tpetra::deep_copy() to get the
proper semantics.
Stokhos:  Add simple CG function and tests.

I wrote simple CG/PCG functions using Tpetra, primarily to test
performance for the embedded UQ scalar types.  I also rearranged the
tests a little bit, and cleaned up some include and cmake logic.
 Changes to ShyLU solve() to avoid creating local importers and local
 multivectors.
Merge branch 'master' of software.sandia.gov:/space/git/Trilinos
 More ShyLU solve() performance improvements.
Panzer: Adding ML coordinate support to the blocked assembly

This only worked for the monolithic assembly, this new parameter list
callback class provides an interface for it to work. Note in the
Teko input file, instead of putting "none" under the "Requested Parameters"
"x-coordinate" (etc...) you end up putting the name of the field that
the coordinates should be drawn from.
Panzer: Fixing a warning by removing an unused internal member
SEACAS: exodiff - fix crash if nodeset/sideset sizes differ and there are nodeset/sideset variables; clean up output to eliminate duplicates and inconsistencies

(From Sierra)
IOSS: More informative error message when there are duplicate names in a mesh

(From Sierra)

Build/Test Cases Summary
Enabled Packages: SEACASExodiff, SEACASIoss
Disabled Packages: Panzer,PyTrilinos,SEACASExo2mat,SEACASMat2exo
Enabled all Forward Packages
0) MPI_DEBUG => Skipped configure, build, test due to no enabled packages! => Does not affect push readiness! (-1.00 min)
1) SERIAL_RELEASE => Skipped configure, build, test due to no enabled packages! => Does not affect push readiness! (-1.00 min)
2) MPI_DEBUG_SS => passed: passed=21,notpassed=0 (25.73 min)
3) SERIAL_RELEASE_SS => passed: passed=22,notpassed=0 (28.08 min)
Other local commits for this build/test group: acc4786