SAM-2296 merge 308358 309094 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-10.x@309202 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25884 merge 307230 308489 to 10.x

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