SAK-26586 merge 311239, 311743, 311745, 311754 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@312249 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27775 merge 311660 to 10.x

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