SAK-25782 merge 306350 306996 to 10.x

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