SAK-26187 merge 309538 309539 to 10.x

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