re #8437 lots of style issues, but not quite all
re #8437 catching a couple of warninga
Merge branch 'feature/8437_cppcheck_style' into develop