SAK-23197 merge 307612 307619 307620 307810 to 10.x

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