SAK-26221 merge 309714, 310131 to 10.x

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