SAK-16600 changes from recent branch of trunk for related updates


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/SAK-16600-mk2@121801 66ffb92e-73f9-0310-93c1-f5514f145a0a