Refs #7342. Fixing warnings.
Merge branch 'bugfix/7342_rhel6_warnings' into develop