Fix for minor missing contents in merges from gitlabhq

A while ago in Public-GitLab the _head_panel.html.haml file was editted (I guess in Windows) and had cr+lf eol-style assigned to it. This seems to have made merges more error-prone, and at the very least difficult to read.

These changes change the file back to lf eol-style and fix the minor change that I'm guessing was overlooked in the 6.1 merge.