SAK-22450 - update branch from trunk

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