SAM-2382 remove DOS line breaks


git-svn-id: https://source.sakaiproject.org/svn/sam/trunk@313720 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2382 sort groups. PAtch from Brian J


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