Xpetra: A cleaner branch for easy review of #4996
Created by: csiefer2
#4996 had some weird inconsistencies with develop which caused github's diff to spaz. I dumped xpetra-eti onto a new branch and then dumped develop on top of that to make this easier to review.