refs #8060 should fix bunch of CPP check warnings