Static analysis warning fixes

Refs #10620
Merge branch 'feature/10620_indirect_tools_interface' into develop