Fixed doxygen and cppcheck errors. Refs #9378.
Merge branch 'feature/9378_filter_event_inelastic' into develop