Synched with Trilinos; cleanup issues
Synched with Trilinos
tag due to addition of nas2exo
Periodic Stable Tag