SAK-25842 merge 307101 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@307519 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23771 merge 307103 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@307524 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25949 merge 307487 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@307527 66ffb92e-73f9-0310-93c1-f5514f145a0a