Revert "Refs #10507. cleaner way to isolate clang"

This reverts commit 35b93996c91348de2bfdae9ced84e56245615119.
Merge branch 'feature/10507_fix_clang_warnings' into develop