refs #8060 should fix bunch of CPP check warnings
Merge branch 'feature/8060_MullerAnsatz' into develop