Refs #8651 fix cppcheck problems