Update formatting. refs #6913
Merge branch 'feature/6913_rhel6_rpm' into develop