SAK-26199 merge 309358 309363 to 10.x

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