SAK-23567 Fixing headers and weird duplication in merge

git-svn-id: https://source.sakaiproject.org/svn/portal/trunk@125740 66ffb92e-73f9-0310-93c1-f5514f145a0a