Sidebar header no conflicts

The original source branch commits were squashed, resulting in a ton of conflicts. Cherry-picking onto a new branch was quicker.

Original MR- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12496