Refs #7832 fix mac build and cppcheck
Merge branch 'feature/7832_SaveLauenorm' into develop