SAK-26095 merge 308262 to 10.x

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

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