refs #9257. Fix cpp check issues.
Merge branch 'feature/9257_ccl_performance_cppcheck_temp' into develop