Refs #7342. Fixing warnings.
Merge remote branch 'origin/bugfix/7342_rhel6_warnings'