Trilinos co dev 6218

I would like to merge this branch into the official TriBITS git repo master branch.