.gitattributes file to normalize line endings
fix hint text, refs #12176
Merge remote-tracking branch 'upstream/master'