SAK-25514 clean up of some HTML, broke out roleSwitcher to snippet

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-25514@133931 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25514 clean up of some HTML, broke out roleSwitcher to snippet

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-25514@133932 66ffb92e-73f9-0310-93c1-f5514f145a0a