Refs #10507. fix warnings on build servers
Merge branch 'feature/10507_fix_clang_warnings' into develop