Refs #7832 fix mac build and cppcheck