refs #7326. Fix warnings.
Merge remote branch 'origin/feature/7326_compiler_warnings'