SAK-27763 merge 311565, 311736 to 10.x

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

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