Fixed cppcheck error and compile warning. Refs #8655.
Merge branch 'feature/8655_filter_in_prenexus' into develop