Refs #9200 remove cppcheck warnings
Merge branch 'feature/9200_cell_type_wrong' into develop