SAK-26128 Added code to resolved expanded site types to base types where required by advisors or tool lists 


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