refs #6753. Fix warnings.
Merge branch 'feature/6753_hkl' into develop