SAK-23845 merge 306993 307826 to 10.x

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